From bccd5ef13ca4e8a5063e35e2bbe6984b99ae6b8e Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Sat, 15 Feb 2025 19:08:18 -0500 Subject: [PATCH] Trims excessive roundstart security guns (#3047) ## About The Pull Request This PR removes the skyrat-added "gun beacons" that security officers and the Head of Security are spawned into the game with. In addition, moves the silver glock case from the Head of Security's locker to the Warden's locker ## Why It's Good For The Game Security officers already get a glock in their lockers (a bubber-added glock) as a sidearm to use, there is little reason for them to spawn with a SECOND sidearm on their person. Given this is Bubber, I preferred to remove the Skyrat option over the native Bubber one. This PR was originally intended to remove some of the **FIVE GUNS** that the Head of Security has personally available to him at round-start. This PR trimmed it down to three, and I gave the Warden a little love by giving them the cool glock instead (the warden never gets anything cool...). If the HoS really wants a glock or something else, they have the means. ## Proof Of Testing
Screenshots/Videos
## Changelog :cl: balance: Removed "sidearm beacons" from spawning SecOff and HoS inventories. Complimentary glocks are still available in security officer lockers. balance: Gave the HoS's silver glock to the Warden. The Head of Security only has three guns at roundstart now! How will he ever recover?? /:cl: --- code/modules/jobs/job_types/head_of_security.dm | 1 - code/modules/jobs/job_types/security_officer.dm | 1 - .../code/modules/security/security_glock/lockers.dm | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index c47bcb75521..45c5b5b54a8 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -57,7 +57,6 @@ suit_store = /obj/item/gun/energy/e_gun //BUBBER EDIT - REVERTS SKYRAT REMOVAL backpack_contents = list( /obj/item/evidencebag = 1, - /obj/item/choice_beacon/security_pistol = 1, //Skyrat Addition ) belt = /obj/item/modular_computer/pda/heads/hos ears = /obj/item/radio/headset/heads/hos/alt diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index f2ad374b5d1..6e4630e7b87 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -223,7 +223,6 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, - /obj/item/choice_beacon/security_pistol = 1, //SKYRAT ADDITION /obj/item/flashlight/seclite = 1, // BUBBER EDIT ADDITION ) belt = /obj/item/modular_computer/pda/security diff --git a/modular_zubbers/code/modules/security/security_glock/lockers.dm b/modular_zubbers/code/modules/security/security_glock/lockers.dm index 58eec4dc08f..531d184e40b 100644 --- a/modular_zubbers/code/modules/security/security_glock/lockers.dm +++ b/modular_zubbers/code/modules/security/security_glock/lockers.dm @@ -2,6 +2,6 @@ . = ..() new /obj/item/storage/toolbox/guncase/skyrat/pistol/sec_glock(src) -/obj/structure/closet/secure_closet/hos/PopulateContents() +/obj/structure/closet/secure_closet/warden/PopulateContents() . = ..() - new /obj/item/storage/toolbox/guncase/skyrat/pistol/hos_glock(src) \ No newline at end of file + new /obj/item/storage/toolbox/guncase/skyrat/pistol/hos_glock(src)