Atmos sprite update #2136
Merged
Atmos sprite update #2136
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Sprites
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Sorry we didn't get to your pr, can you fix the conflicts here? |
|
Ah right my bad, I'll go fix that |
|
Fixed the merge conflict |
thgvr
approved these changes
Jul 17, 2023
shiptest-server
pushed a commit
that referenced
this pull request
Jul 17, 2023
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.   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
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.   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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
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
馃啈
imageadd: updates some atmos sprites to fit in with the rest of engineering
/:cl: