Skip to content

Commit

Permalink
Moves secoff Paco spawn to backpack
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
Moves secoff Paco spawn to backpack to account for loadout
Fixes #2424
<!-- 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
Lets secoffs have drip and their gun
<!-- 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: fixed secoffs not getting paco with non standard suit
/: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
Shoddd committed Sep 13, 2024
1 parent d1325ff commit b07d73e
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions code/modules/jobs/job_types/security_officer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
qdel(spawning.ears)
spawning.equip_to_slot_or_del(new ears(spawning),ITEM_SLOT_EARS)

//monkestation edit start: add dept sec outfits
if(suit)
for(var/obj/item/gun/ballistic/automatic/pistol/paco/no_mag/stored in spawning.contents)
if(spawning.wear_suit)
qdel(spawning.wear_suit)
spawning.equip_to_slot_or_del(new suit(spawning),ITEM_SLOT_OCLOTHING)
spawning.equip_to_slot_or_del(stored,ITEM_SLOT_SUITSTORE)
//monkestation edit start: add dept sec outfitsif(suit)
if(head)
if(spawning.head && !isplasmaman(spawning))
qdel(spawning.head)
Expand Down Expand Up @@ -224,10 +218,10 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
uniform = /obj/item/clothing/under/rank/security/officer
head = /obj/item/clothing/head/helmet/hat/cowboy //monkestation edit: cowboy sec
suit = /obj/item/clothing/suit/armor/secduster //monkestation edit: cowboy sec
suit_store = /obj/item/gun/ballistic/automatic/pistol/paco/no_mag //monkestation edit: Paco sec
backpack_contents = list(
/obj/item/evidencebag = 1,
/obj/item/ammo_box/magazine/m35/rubber = 2, //monkestation edit: Paco sec
/obj/item/ammo_box/magazine/m35/rubber = 2,
/obj/item/gun/ballistic/automatic/pistol/paco/no_mag, //monkestation edit: Paco sec
)
belt = /obj/item/modular_computer/pda/security
ears = /obj/item/radio/headset/headset_sec/alt
Expand Down

0 comments on commit b07d73e

Please sign in to comment.