Port "Fixes the 88 Mod 4's holster sprite" #391
Merged
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
**no actual sprite changes, I just renamed a couple** Fixes the 88 Mod 4 pistol not having a holster sprite, and showing as a bunch of orange question marks. This was happening because #5729 changed its `icon_state` from `"88m4"` to `"_88m4"` in order to make it actually work with CSS, but the sprite in `icons/obj/items/clothing/belts.dmi` wasn't renamed with it. I also changed the `item_state` to be the same and renamed the inhand sprites, just to reduce any future confusion. Fixes the gun not being a gun. <details> <summary>Screenshots & Videos</summary> **Before:**  **After:**  </details> :cl: fix: Fixed the 88 Mod 4 pistol's holster sprite. /:cl:
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
Port of cmss13-devs/cmss13#5785
Fixes mod88 holstered sprite, and also stops indicating merge conflicts on poor innocent PRs.
Explain why it's good for the game
No longer unfairly conflicting any icon PRs.
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑
fix: Fixed the 88 Mod 4 pistol's holster sprite.
/:cl: