From c2b82a7ea23100e9dfec7dc0f79da57f65b40762 Mon Sep 17 00:00:00 2001 From: DATAxPUNGED <44149906+DATA-xPUNGED@users.noreply.github.com> Date: Sun, 9 Jul 2023 03:30:15 -0300 Subject: [PATCH] Gives Warden their own Garment Bag. (#76579) ## About The Pull Request Puts all of warden's clothes on a garment bag, and puts said garment bag on warden's locker ## Why It's Good For The Game Warden has almost as much alternative clothing as a head, using his locker is kind of a pain, and this oughta fix that ## Changelog :cl: qol: The Warden's locker now has a garment bag /:cl: --------- Co-authored-by: Jolly <70232195+Jolly-66@users.noreply.github.com> --- code/game/objects/items/storage/garment.dm | 16 ++++++++++++++++ .../crates_lockers/closets/secure/security.dm | 11 +---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 5ce65ae8608..d1394a7a858 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -14,6 +14,10 @@ name = "head of security's garment bag" desc = "A bag for storing extra clothes and shoes. This one belongs to the head of security." +/obj/item/storage/bag/garment/warden + name = "warden's garment bag" + desc = "A bag for storing extra clothes and shoes. This one belongs to the warden." + /obj/item/storage/bag/garment/hop name = "head of personnel's garment bag" desc = "A bag for storing extra clothes and shoes. This one belongs to the head of personnel." @@ -88,6 +92,18 @@ new /obj/item/clothing/mask/gas/sechailer/swat(src) new /obj/item/clothing/neck/cloak/hos(src) +/obj/item/storage/bag/garment/warden/PopulateContents() + new /obj/item/clothing/suit/armor/vest/warden(src) + new /obj/item/clothing/head/hats/warden(src) + new /obj/item/clothing/head/hats/warden/drill(src) + new /obj/item/clothing/head/beret/sec/navywarden(src) + new /obj/item/clothing/suit/armor/vest/warden/alt(src) + new /obj/item/clothing/under/rank/security/warden/formal(src) + new /obj/item/clothing/under/rank/security/warden/skirt(src) + new /obj/item/clothing/gloves/krav_maga/sec(src) + new /obj/item/clothing/glasses/hud/security/sunglasses(src) + new /obj/item/clothing/mask/gas/sechailer(src) + /obj/item/storage/bag/garment/research_director/PopulateContents() new /obj/item/clothing/under/rank/rnd/research_director(src) new /obj/item/clothing/under/rank/rnd/research_director/skirt(src) 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 59c0643cc94..c300d867398 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -81,21 +81,12 @@ ..() new /obj/item/dog_bone(src) new /obj/item/radio/headset/headset_sec(src) - new /obj/item/clothing/suit/armor/vest/warden(src) - new /obj/item/clothing/head/hats/warden(src) - new /obj/item/clothing/head/hats/warden/drill(src) - new /obj/item/clothing/head/beret/sec/navywarden(src) - new /obj/item/clothing/suit/armor/vest/warden/alt(src) - new /obj/item/clothing/under/rank/security/warden/formal(src) - new /obj/item/clothing/under/rank/security/warden/skirt(src) - new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/holosign_creator/security(src) - new /obj/item/clothing/mask/gas/sechailer(src) + new /obj/item/storage/bag/garment/warden new /obj/item/storage/box/zipties(src) new /obj/item/storage/box/flashbangs(src) new /obj/item/storage/belt/security/full(src) new /obj/item/flashlight/seclite(src) - new /obj/item/clothing/gloves/krav_maga/sec(src) new /obj/item/door_remote/head_of_security(src) /obj/structure/closet/secure_closet/security