Skip to content

Commit

Permalink
JSDF Rifle unloaded state fix (#6427)
Browse files Browse the repository at this point in the history
<!-- 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

fixes improperly set unloaded icon for the JSDF rifle

## Why It's Good For The Game

things should work

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: fixed JSDF rifle unloaded icon state
/: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. -->
  • Loading branch information
seekssss authored May 10, 2024
1 parent d6fbdfa commit b344b16
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions code/modules/vore/fluffstuff/custom_guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@
slot_flags = SLOT_BACK
one_handed_penalty = 60 // The weapon itself is heavy

/obj/item/gun/ballistic/automatic/battlerifle/update_icon()
. = ..()
update_held_icon()

/obj/item/gun/ballistic/automatic/battlerifle/update_icon_state()
. = ..()
if(istype(ammo_magazine,/obj/item/ammo_magazine/m95))
icon_state = "battlerifle"
else
icon_state = (ammo_magazine)? "battlerifle" : "battlerifle_empty"

// For general use
/obj/item/gun/ballistic/shotgun/pump/JSDF
name = "\improper JSDF tactical shotgun"
Expand Down

0 comments on commit b344b16

Please sign in to comment.