Shotgun icon fix (Take Two)#5303
Merged
MistakeNot4892 merged 1 commit intoNebulaSS13:stablefrom Feb 17, 2026
Merged
Conversation
Closed
out-of-phaze
approved these changes
Feb 17, 2026
| var/recentpump = 0 // to prevent spammage | ||
| load_sound = 'sound/weapons/guns/interaction/shotgun_instert.ogg' | ||
|
|
||
| /obj/item/gun/projectile/shotgun/update_base_icon_state() |
Member
There was a problem hiding this comment.
you know, this is actually the only thing that directly references /obj/item/gun/projectile/shotgun. while it's a shared type used for both the pump shotgun and double-barreled shotgun, they don't actually share any behavior aside from this override, which isn't even correct for the pump shotgun. i should fix that
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description of changes
I noticed that pump action shotguns check for shells in the tube, not shells in the chamber when decided whether to display as empty. This doesn't reflect whether the shotgun is actually "loaded", as you can still have a shell in the chamber.
Why and what will this PR improve
You can now tell if a shotgun is loaded by looking at it, rather than guessing on whether or not there's a shell in the chamber. This is better from a gameplay standpoint, more immersive, and more realistic.
Authorship
It's me, Karl Johansson
Changelog
🆑 Karl Johansson
bugfix: Fixes pump-action shotgun icons incorrectly displaying the state of the weapon
/:cl: