From 11441010129f3c1a43bceb6bac2b2da42fee045b Mon Sep 17 00:00:00 2001 From: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Thu, 22 Sep 2022 21:02:22 -0400 Subject: [PATCH] [MIRROR] Adds job winter coats to job lockers (ABLE TO BE MERGED) (#12904) * Adds job winter coats to job lockers * Update hooded.dm * Update wardrobe.dm * Update security.dm * Update scientist.dm * Update medical.dm * Update cargo.dm * Update job_closets.dm * Update job_closets.dm * Update hooded.dm Co-authored-by: Spookerton Co-authored-by: C.L --- .../objects/structures/crates_lockers/closets/job_closets.dm | 4 +++- .../structures/crates_lockers/closets/secure/medical.dm | 2 ++ .../structures/crates_lockers/closets/secure/scientist.dm | 4 ++-- .../structures/crates_lockers/closets/secure/security.dm | 2 +- .../objects/structures/crates_lockers/closets/wardrobe.dm | 3 +++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index e1a58bb0ca..86cb04e20d 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -33,6 +33,7 @@ /obj/item/clothing/under/sl_suit = 2, /obj/item/clothing/under/rank/bartender = 2, /obj/item/clothing/under/rank/bartender/skirt, + /obj/item/clothing/suit/storage/hooded/wintercoat/bar, /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/accessory/wcoat = 2, /obj/item/clothing/shoes/black = 2, @@ -70,6 +71,7 @@ /obj/item/clothing/under/dress/maid/janitor, /obj/item/device/radio/headset/headset_service, /obj/item/weapon/cartridge/janitor, + /obj/item/clothing/suit/storage/hooded/wintercoat/janitor, /obj/item/clothing/gloves/black, /obj/item/clothing/head/soft/purple, /obj/item/clothing/head/beret/purple, @@ -127,4 +129,4 @@ /obj/item/weapon/storage/box/lights/mixed = 3, /obj/item/weapon/storage/box/mousetraps = 1, /obj/item/weapon/grenade/chem_grenade/cleaner = 4 - ) \ No newline at end of file + ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 94d92a7cc5..e83c3764a8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -41,6 +41,7 @@ /obj/item/device/radio/headset/headset_med, /obj/item/device/radio/headset/headset_med/alt, /obj/item/clothing/suit/storage/hooded/wintercoat/medical, + /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt, /obj/item/clothing/shoes/boots/winter/medical, /obj/item/clothing/under/rank/nursesuit, /obj/item/clothing/head/nursehat, @@ -106,6 +107,7 @@ /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/suit/storage/toggle/labcoat/emt, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para, + /obj/item/clothing/shoes/boots/winter/medical, /obj/item/device/radio/headset/headset_med/alt, /obj/item/weapon/cartridge/medical, /obj/item/weapon/storage/briefcase/inflatable, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index a23147b0c5..890a55deab 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -60,7 +60,7 @@ /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/toggle/labcoat/modern, /obj/item/clothing/shoes/white, - /obj/item/weapon/melee/umbrella, // vorestation addition, + /obj/item/weapon/melee/umbrella, /obj/item/clothing/glasses/science, /obj/item/device/radio/headset/headset_sci, /obj/item/weapon/storage/belt/archaeology, @@ -85,4 +85,4 @@ /obj/item/device/measuring_tape, /obj/item/weapon/pickaxe/hand, /obj/item/weapon/storage/bag/fossils, - /obj/item/weapon/hand_labeler) \ No newline at end of file + /obj/item/weapon/hand_labeler) 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 216a55c822..2b64c20d0f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -60,7 +60,7 @@ /obj/item/clothing/under/suit_jacket/teal/skirt, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/suit/storage/hooded/wintercoat/hop, - /obj/item/clothing/head/caphat/hop/beret/, + /obj/item/clothing/head/caphat/hop/beret, /obj/item/clothing/head/caphat/hop/beret/white) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 0f5c1e0c9d..d72db42995 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -237,6 +237,7 @@ starts_with = list( /obj/item/clothing/under/rank/roboticist = 2, /obj/item/clothing/suit/storage/toggle/labcoat = 2, + /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics, /obj/item/clothing/shoes/black = 2, /obj/item/clothing/gloves/black = 2, /obj/item/weapon/storage/backpack/toxins, @@ -260,6 +261,7 @@ /obj/item/clothing/under/rank/chemist/skirt = 2, /obj/item/clothing/shoes/white = 2, /obj/item/clothing/suit/storage/toggle/labcoat/chemist = 2, + /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist, /obj/item/weapon/storage/backpack/chemistry = 2, /obj/item/weapon/storage/backpack/satchel/chem = 2, /obj/item/weapon/storage/bag/chemistry = 2,) @@ -287,6 +289,7 @@ /obj/item/clothing/under/rank/virologist/skirt = 2, /obj/item/clothing/shoes/white = 2, /obj/item/clothing/suit/storage/toggle/labcoat/virologist = 2, + /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro, /obj/item/clothing/mask/surgical = 2, /obj/item/weapon/storage/backpack/virology = 2, /obj/item/weapon/storage/backpack/satchel/vir = 2)