From f045d163098e55d38718ac5a010adc8906671999 Mon Sep 17 00:00:00 2001 From: Jaraci <57604458+Jaraci@users.noreply.github.com> Date: Thu, 29 Sep 2022 17:41:50 +0100 Subject: [PATCH] Readds the engineering + atmos clothing wardrobes (and updates their contents for Horizon engineering) (#14862) --- .../structures/crates_lockers/closets/wardrobe.dm | 10 +++++++++- html/changelogs/omicega-engidripenhancement.yml | 13 +++++++++++++ maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 9 +++++---- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/omicega-engidripenhancement.yml diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 2e880f47d42..6b2daa39b86 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -167,11 +167,15 @@ new /obj/item/clothing/head/hardhat/red(src) new /obj/item/clothing/head/hardhat/green(src) new /obj/item/clothing/head/beret/engineering(src) + new /obj/item/clothing/head/beret/corporate/heph(src) + new /obj/item/clothing/head/beret/corporate/zavod(src) new /obj/item/clothing/head/bandana/atmos(src) + new /obj/item/clothing/suit/storage/hazardvest/green(src) + new /obj/item/clothing/suit/storage/hazardvest/red(src) + new /obj/item/clothing/suit/storage/hazardvest/blue/atmos(src) return - /obj/structure/closet/wardrobe/engineering_yellow name = "engineering wardrobe" icon_door = "yellow" @@ -191,10 +195,14 @@ new /obj/item/clothing/head/hardhat/green(src) new /obj/item/clothing/head/beret/engineering(src) new /obj/item/clothing/head/beret/engineering(src) + new /obj/item/clothing/head/beret/corporate/heph(src) + new /obj/item/clothing/head/beret/corporate/zavod(src) new /obj/item/clothing/head/bandana/engineering(src) new /obj/item/clothing/head/bandana/engineering(src) new /obj/item/clothing/suit/storage/toggle/highvis(src) new /obj/item/clothing/suit/storage/toggle/highvis(src) + new /obj/item/clothing/suit/storage/hazardvest/green(src) + new /obj/item/clothing/suit/storage/hazardvest/red(src) /obj/structure/closet/wardrobe/white diff --git a/html/changelogs/omicega-engidripenhancement.yml b/html/changelogs/omicega-engidripenhancement.yml new file mode 100644 index 00000000000..1ddae55cf4d --- /dev/null +++ b/html/changelogs/omicega-engidripenhancement.yml @@ -0,0 +1,13 @@ +# Your name. +author: Omicega + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Readds the engineering + atmos clothing wardrobes from the Aurora map." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 03a3e7c2794..067ff4b5f1a 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -218,6 +218,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 4 }, +/obj/structure/closet/wardrobe/atmospherics_yellow, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "aeC" = ( @@ -5086,6 +5087,7 @@ /obj/item/reagent_containers/extinguisher_refill/filled, /obj/item/reagent_containers/extinguisher_refill/filled, /obj/item/reagent_containers/extinguisher_refill/filled, +/obj/item/device/hand_labeler, /turf/simulated/floor/tiled, /area/engineering/locker_room) "cDE" = ( @@ -30829,9 +30831,7 @@ /obj/effect/floor_decal/corner_wide/yellow{ dir = 9 }, -/obj/structure/table/standard, -/obj/item/hoist_kit, -/obj/item/ladder_mobile, +/obj/structure/closet/wardrobe/engineering_yellow, /turf/simulated/floor/tiled, /area/engineering/locker_room) "qlm" = ( @@ -39762,11 +39762,12 @@ /obj/effect/floor_decal/corner_wide/yellow{ dir = 9 }, -/obj/item/device/hand_labeler, /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Locker Room"; dir = 4 }, +/obj/item/hoist_kit, +/obj/item/ladder_mobile, /turf/simulated/floor/tiled, /area/engineering/locker_room) "uOV" = (