Skip to content

Commit

Permalink
Gives Guardman Helmet Armor (#3365)
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
Gives Guardman Helmet from sectech vender armor. Makes a second armored version and puts it there.
Fixes #1510
<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->

## Why It's Good For The Game
fixes bug/oversight, gives sec 'drip' without costing armor
<!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. -->

## 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: Security's Guardman Helmet now armored
/:cl:
  • Loading branch information
Shoddd authored Sep 13, 2024
1 parent 1d26f43 commit d559119
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@
inhand_icon_state = "blueshift_helmet"
custom_premium_price = PAYCHECK_COMMAND

/obj/item/clothing/head/helmet/guardmanhelmet
name = "guardman's helmet"
desc = "Keeps your brain intact when fighting heretics"
icon = 'monkestation/icons/obj/clothing/hats.dmi'
worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
icon_state = "guardman_helmet"

/obj/item/clothing/head/helmet/toggleable
dog_fashion = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vending/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/obj/item/storage/belt/holster/energy = 4,
/obj/item/clothing/head/helmet/civilprotection_helmet = 1, //monkestation edit
/obj/item/clothing/suit/armor/civilprotection_vest = 1, //monkestation edit
/obj/item/clothing/head/guardmanhelmet = 1, //monkestation edit: Guardman
/obj/item/clothing/head/helmet/guardmanhelmet = 1, //monkestation edit: Guardman
/obj/item/clothing/under/guardmanuniform = 1, //monkestation edit: Guardman
/obj/item/clothing/suit/armor/guardmanvest = 1, //monkestation edit: Guardman
/obj/item/citationinator = 3 // monkestation edit: security assistants
Expand Down

0 comments on commit d559119

Please sign in to comment.