Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resprites the fireaxe inhands, 3/4th-ifies the fire axe cabinet #65199

Merged
merged 3 commits into from
Feb 28, 2022

Conversation

Ebin-Halcyon
Copy link
Contributor

@Ebin-Halcyon Ebin-Halcyon commented Feb 27, 2022

About The Pull Request

What it says on the tin, resprites the fire axe inhands, worn, and in cabinet sprite to be inline with the obj sprite

unknown_2022.02.27-16.05_Trim.mp4

3/4th-ified cabinet + breaking states

unknown_2022.02.28-13.15.mp4
unknown_2022.02.28-13.16_Trim.mp4

Why It's Good For The Game

less jarringly different sprites for the inhand and obj sprites.
Was asked to do this by Imaginos after I tinkered with an energy fire axe.

Changelog

馃啈
imageadd: New fireaxe inhand, worn, and in cabinet sprites.
/:cl:

@tgstation-server tgstation-server added the Sprites A bikeshed full of soulless bikes. label Feb 27, 2022
@github-actions
Copy link
Contributor

You currently have a negative Fix/Feature pull request delta of -8. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score.

@MaineTheMan
Copy link

the axehead looks a bit big but nice otherwise

Copy link
Contributor

@Imaginos16 Imaginos16 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ebin

@bruhlookatthisdood
Copy link

the fire axe in cabinet looks like its just sticking out a bit.

@Ebin-Halcyon
Copy link
Contributor Author

the fire axe in cabinet looks like its just sticking out a bit.

o shit didn't even notice that, give me a second.

@Ebin-Halcyon Ebin-Halcyon changed the title Resprites some fire axe sprites Resprites the fireaxe inhands, 3/4th-ifies the fire axe cabinet Feb 28, 2022
@Imaginos16 Imaginos16 merged commit ba57f5e into tgstation:master Feb 28, 2022
github-actions bot added a commit that referenced this pull request Feb 28, 2022
@Ebin-Halcyon Ebin-Halcyon deleted the fiya-akse branch February 28, 2022 22:04
@bruhlookatthisdood
Copy link

very good

github-merge-queue bot pushed a commit to shiptest-ss13/Shiptest that referenced this pull request Jul 17, 2023
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Updates the sprites for the atmos firesuit, inhand fireaxe, and fireaxe
cabinet to fit in with the rest of the engineering sprites. Also,
fireaxe item sprite is no longer upside down when unwielded.

![image](https://github.com/shiptest-ss13/Shiptest/assets/93578146/24f75111-dd9c-42f5-b35d-e52e53ad03fa)

![image](https://github.com/shiptest-ss13/Shiptest/assets/93578146/93b1e744-f0b9-4119-9142-17e5a664ea87)

Sprites are from tgstation/tgstation#72736 and tgstation/tgstation#65199

## Why It's Good For The Game
Makes atmos firesuit and axe sprites fit in with the newer engineering
sprites, also I think it looks nice.

## Changelog

:cl:
imageadd: updates some atmos sprites to fit in with the rest of
engineering
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
MarkSuckerberg pushed a commit to MarkSuckerberg/Shiptest that referenced this pull request Aug 11, 2023
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Updates the sprites for the atmos firesuit, inhand fireaxe, and fireaxe
cabinet to fit in with the rest of the engineering sprites. Also,
fireaxe item sprite is no longer upside down when unwielded.

![image](https://github.com/shiptest-ss13/Shiptest/assets/93578146/24f75111-dd9c-42f5-b35d-e52e53ad03fa)

![image](https://github.com/shiptest-ss13/Shiptest/assets/93578146/93b1e744-f0b9-4119-9142-17e5a664ea87)

Sprites are from tgstation/tgstation#72736 and tgstation/tgstation#65199

## Why It's Good For The Game
Makes atmos firesuit and axe sprites fit in with the newer engineering
sprites, also I think it looks nice.

## Changelog

:cl:
imageadd: updates some atmos sprites to fit in with the rest of
engineering
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
MarkSuckerberg pushed a commit to MarkSuckerberg/Shiptest that referenced this pull request Sep 13, 2023
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Updates the sprites for the atmos firesuit, inhand fireaxe, and fireaxe
cabinet to fit in with the rest of the engineering sprites. Also,
fireaxe item sprite is no longer upside down when unwielded.

![image](https://github.com/shiptest-ss13/Shiptest/assets/93578146/24f75111-dd9c-42f5-b35d-e52e53ad03fa)

![image](https://github.com/shiptest-ss13/Shiptest/assets/93578146/93b1e744-f0b9-4119-9142-17e5a664ea87)

Sprites are from tgstation/tgstation#72736 and tgstation/tgstation#65199

## Why It's Good For The Game
Makes atmos firesuit and axe sprites fit in with the newer engineering
sprites, also I think it looks nice.

## Changelog

:cl:
imageadd: updates some atmos sprites to fit in with the rest of
engineering
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants