From ba5403c3ab4ae4ba1d98717ec1cc97a72a6319f1 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Thu, 12 Jan 2023 17:16:01 +0000 Subject: [PATCH] Makes department guard gear consistent (#18161) * makes department guard gear consistent * forgot cuffs * does it right this time * Update security.dm * Update security.dm --- .../crates_lockers/closets/secure/security.dm | 10 +++++----- .../modules/goofsec/code/department_guards.dm | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 338b77475be..70ba347424c 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -132,20 +132,20 @@ icon = 'icons/obj/storage/closet.dmi' /obj/structure/closet/secure_closet/security/cargo/PopulateContents() - new /obj/item/storage/box/gunset/pepperball(src) new /obj/item/storage/bag/garment/customs_agent(src) new /obj/item/restraints/handcuffs/cable/orange(src) + new /obj/item/assembly/flash/handheld(src) /obj/structure/closet/secure_closet/security/engine name = "\proper engineering guard's locker" - req_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_ENGINE_EQUIP) + req_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_ENGINEERING) icon_state = "eng_secure" icon = 'icons/obj/storage/closet.dmi' /obj/structure/closet/secure_closet/security/engine/PopulateContents() new /obj/item/restraints/handcuffs/cable/yellow(src) - new /obj/item/storage/box/gunset/pepperball(src) new /obj/item/storage/bag/garment/engineering_guard(src) + new /obj/item/assembly/flash/handheld(src) /obj/structure/closet/secure_closet/security/science name = "\proper science guard's locker" @@ -155,8 +155,8 @@ /obj/structure/closet/secure_closet/security/science/PopulateContents() new /obj/item/restraints/handcuffs/cable/pink(src) - new /obj/item/storage/box/gunset/pepperball(src) new /obj/item/storage/bag/garment/science_guard(src) + new /obj/item/assembly/flash/handheld(src) /obj/structure/closet/secure_closet/security/med name = "\proper orderly's locker" @@ -166,8 +166,8 @@ /obj/structure/closet/secure_closet/security/med/PopulateContents() new /obj/item/restraints/handcuffs/cable/blue(src) - new /obj/item/storage/box/gunset/pepperball(src) new /obj/item/storage/bag/garment/orderly(src) + new /obj/item/assembly/flash/handheld(src) // SKYRAT EDIT CHANGE END -- GOOFSEC DEP GUARDS /obj/structure/closet/secure_closet/detective diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm index 4e256c98545..5324794a270 100644 --- a/modular_skyrat/modules/goofsec/code/department_guards.dm +++ b/modular_skyrat/modules/goofsec/code/department_guards.dm @@ -195,9 +195,11 @@ shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/helmet/blueshirt/skyrat suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat + r_pocket = /obj/item/assembly/flash/handheld + l_pocket = /obj/item/restraints/handcuffs/cable/pink backpack_contents = list( /obj/item/melee/baton/security/loaded/departmental/science = 1, - /obj/item/assembly/flash/handheld = 1, + /obj/item/storage/box/gunset/pepperball = 1, ) backpack = /obj/item/storage/backpack/science @@ -297,9 +299,11 @@ shoes = /obj/item/clothing/shoes/sneakers/white head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/orderly + r_pocket = /obj/item/assembly/flash/handheld + l_pocket = /obj/item/restraints/handcuffs/cable/blue backpack_contents = list( /obj/item/melee/baton/security/loaded/departmental/medical = 1, - /obj/item/assembly/flash/handheld = 1, + /obj/item/storage/box/gunset/pepperball = 1, ) backpack = /obj/item/storage/backpack/medic @@ -393,9 +397,11 @@ uniform = /obj/item/clothing/under/rank/security/officer/blueshirt/skyrat/engineering_guard head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/engineering_guard + r_pocket = /obj/item/assembly/flash/handheld + l_pocket = /obj/item/restraints/handcuffs/cable/yellow backpack_contents = list( /obj/item/melee/baton/security/loaded/departmental/engineering = 1, - /obj/item/assembly/flash/handheld = 1, + /obj/item/storage/box/gunset/pepperball = 1, ) backpack = /obj/item/storage/backpack/industrial @@ -496,9 +502,11 @@ head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/customs_agent glasses = /obj/item/clothing/glasses/hud/gun_permit + r_pocket = /obj/item/assembly/flash/handheld + l_pocket = /obj/item/restraints/handcuffs/cable/orange backpack_contents = list( /obj/item/melee/baton/security/loaded/departmental/cargo = 1, - /obj/item/assembly/flash/handheld = 1, + /obj/item/storage/box/gunset/pepperball = 1, ) backpack = /obj/item/storage/backpack @@ -591,10 +599,11 @@ shoes = /obj/item/clothing/shoes/sneakers/black head = /obj/item/clothing/head/helmet/blueshirt/skyrat/guard suit = /obj/item/clothing/suit/armor/vest/blueshirt/skyrat/guard - l_pocket = /obj/item/restraints/handcuffs + l_pocket = /obj/item/restraints/handcuffs/cable/green r_pocket = /obj/item/assembly/flash/handheld backpack_contents = list( /obj/item/melee/baton/security/loaded/departmental/service = 1, + /obj/item/storage/box/gunset/pepperball = 1, ) glasses = /obj/item/clothing/glasses/sunglasses