From c4a275d724ffe0d3f4ae253bbf2df477b5c9ef26 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Fri, 18 Nov 2022 12:37:42 +0100 Subject: [PATCH] Adds Suit Coolers to Atmos Tech Suit Storages (#14816) --- .../closets/secure/engineering.dm | 2 +- html/changelogs/atmos_suit_coolers.yml | 7 + maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 139 +++++++++--------- 3 files changed, 80 insertions(+), 68 deletions(-) create mode 100644 html/changelogs/atmos_suit_coolers.yml diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 51fbb2420f7..3ac74afe4c8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -74,6 +74,7 @@ new /obj/item/storage/belt/utility(src) new /obj/item/device/gps/engineering(src) new /obj/item/pipewrench(src) + new /obj/item/device/flashlight/heavy(src) new /obj/item/grenade/chem_grenade/antifuel(src) // Painters @@ -91,7 +92,6 @@ new /obj/item/clothing/accessory/storage/brown_vest(src) new /obj/item/clothing/suit/fire/atmos(src) new /obj/item/clothing/head/hardhat/atmos(src) - new /obj/item/device/flashlight(src) new /obj/item/extinguisher(src) new /obj/item/device/radio/headset/headset_eng(src) new /obj/item/device/radio/headset/headset_eng/alt(src) diff --git a/html/changelogs/atmos_suit_coolers.yml b/html/changelogs/atmos_suit_coolers.yml new file mode 100644 index 00000000000..c98ecf31537 --- /dev/null +++ b/html/changelogs/atmos_suit_coolers.yml @@ -0,0 +1,7 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Adds suit coolers to the atmos technician suit storages." + - bugfix: "Moves the heavy flashlight in engineering's locker room to the Engineer locker." \ 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 8c99d592e23..a0e8d731fcd 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -2636,11 +2636,11 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "bhR" = ( -/obj/effect/floor_decal/corner_wide/yellow{ +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/floor_decal/corner/yellow{ dir = 9 }, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled, /area/engineering/locker_room) "bib" = ( @@ -4469,10 +4469,12 @@ }, /obj/structure/table/rack, /obj/item/storage/bag/inflatable, +/obj/item/device/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/atmos, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos/storage) "bZD" = ( @@ -4527,10 +4529,8 @@ /area/server) "caB" = ( /obj/structure/table/standard, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/effect/floor_decal/corner_wide/yellow{ +/obj/item/storage/bag/circuits/basic, +/obj/effect/floor_decal/corner/yellow{ dir = 10 }, /turf/simulated/floor/tiled, @@ -5369,14 +5369,14 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 - }, /obj/item/reagent_containers/extinguisher_refill/filled, /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, +/obj/effect/floor_decal/corner/yellow/full{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/locker_room) "cDE" = ( @@ -8838,12 +8838,11 @@ /turf/simulated/floor/wood, /area/horizon/hallway/deck_two/fore) "eui" = ( +/obj/machinery/disposal/small/south, +/obj/structure/disposalpipe/trunk, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, -/obj/machinery/disposal/small/south, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled, /area/engineering/locker_room) "euT" = ( @@ -9370,11 +9369,9 @@ /area/operations/break_room) "eIU" = ( /obj/machinery/firealarm/south, -/obj/effect/floor_decal/corner_wide/yellow{ +/obj/effect/floor_decal/corner/yellow{ dir = 10 }, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/engineering/locker_room) "eJl" = ( @@ -13017,12 +13014,10 @@ pixel_x = -24 }, /obj/structure/cable/green, -/obj/effect/floor_decal/corner/yellow{ - dir = 9 - }, /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/corner/yellow/full, /turf/simulated/floor/tiled, /area/engineering/storage_eva) "gtn" = ( @@ -13348,10 +13343,12 @@ }, /obj/structure/table/rack, /obj/item/storage/bag/inflatable, +/obj/item/device/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/atmos, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos/storage) "gAN" = ( @@ -16408,10 +16405,6 @@ "ibx" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/engineering, /obj/structure/window/reinforced{ dir = 8 }, @@ -16419,6 +16412,11 @@ name = "Engineering Voidsuit Access"; req_access = list(11) }, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/engineering, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/void/engineering, /turf/simulated/floor/tiled/dark/full, /area/engineering/storage_eva) "ibE" = ( @@ -16828,10 +16826,6 @@ "ilB" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/engineering, /obj/structure/window/reinforced{ dir = 4 }, @@ -16839,6 +16833,11 @@ name = "Engineering Voidsuit Access"; req_access = list(11) }, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/engineering, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/void/engineering, /turf/simulated/floor/tiled/dark/full, /area/engineering/storage_eva) "ilT" = ( @@ -18171,10 +18170,6 @@ pixel_y = -28 }, /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/engineering, /obj/structure/window/reinforced{ dir = 4 }, @@ -18183,6 +18178,11 @@ req_access = list(11) }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/engineering, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/void/engineering, /turf/simulated/floor/tiled/dark/full, /area/engineering/storage_eva) "iVQ" = ( @@ -18827,7 +18827,7 @@ /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled, /area/engineering/locker_room) "jlP" = ( @@ -19510,13 +19510,12 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "jBu" = ( -/obj/structure/table/standard, /obj/machinery/light{ dir = 8 }, -/obj/item/storage/bag/circuits/basic, -/obj/item/device/flashlight/heavy, -/obj/effect/floor_decal/corner_wide/yellow/full, +/obj/structure/closet/wardrobe/engineering_yellow, +/obj/effect/floor_decal/corner/yellow/full, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled, /area/engineering/locker_room) "jBw" = ( @@ -19789,7 +19788,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_one) "jIf" = ( -/obj/effect/floor_decal/corner_wide/yellow{ +/obj/effect/floor_decal/corner/yellow{ dir = 9 }, /turf/simulated/floor/tiled, @@ -26090,7 +26089,7 @@ req_access = list(11) }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/full, /area/engineering/locker_room) "mUz" = ( /obj/structure/cable/green{ @@ -29933,11 +29932,11 @@ pixel_x = 24 }, /obj/structure/cable/green, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled, /area/engineering/locker_room) "oTK" = ( @@ -30508,10 +30507,6 @@ /area/operations/break_room) "pfp" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/engineering, /obj/structure/window/reinforced{ dir = 8 }, @@ -30520,6 +30515,11 @@ req_access = list(11) }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/engineering, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/void/engineering, /turf/simulated/floor/tiled/dark/full, /area/engineering/storage_eva) "pfr" = ( @@ -32335,15 +32335,19 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/table/rack, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/engineering, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/void/engineering, +/obj/structure/window/reinforced{ + dir = 8 + }, /obj/machinery/door/window/northright{ name = "Engineering Voidsuit Access"; req_access = list(11) }, -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/head/helmet/space/void/engineering, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/engineering/storage_eva) "qen" = ( /obj/effect/floor_decal/corner/mauve{ @@ -32581,13 +32585,11 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "qkF" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 +/obj/effect/floor_decal/corner/yellow{ + dir = 10 }, -/obj/structure/closet/wardrobe/engineering_yellow, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, -/area/engineering/locker_room) +/area/engineering/storage_eva) "qld" = ( /obj/structure/closet/crate{ name = "Emergency Fuel" @@ -41932,15 +41934,15 @@ /area/horizon/kitchen/hallway) "uOT" = ( /obj/structure/table/standard, -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 - }, /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Locker Room"; dir = 4 }, /obj/item/hoist_kit, /obj/item/ladder_mobile, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/engineering/locker_room) "uOV" = ( @@ -42297,6 +42299,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/yellow{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/engineering/locker_room) "uYW" = ( @@ -45310,10 +45315,10 @@ /area/maintenance/wing/port/far) "wrA" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/floor_decal/corner_wide/yellow{ +/obj/effect/floor_decal/corner/yellow{ dir = 6 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/engineering, /turf/simulated/floor/tiled, /area/engineering/locker_room) "wrK" = ( @@ -46854,12 +46859,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "xbv" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/effect/floor_decal/corner/yellow{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/engineering/locker_room) "xbP" = ( @@ -47038,8 +47043,8 @@ c_tag = "Engineering - Equipment Storage"; dir = 8 }, -/obj/effect/floor_decal/corner/yellow{ - dir = 6 +/obj/effect/floor_decal/corner/yellow/full{ + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/storage_eva) @@ -63997,7 +64002,7 @@ hal laB cDD uOT -qkF +bhR bhR jIf jBu @@ -65212,7 +65217,7 @@ jNp iMG irF wTU -mfE +qkF iVO kxP fsf @@ -65414,7 +65419,7 @@ xeT hVu mfE wTU -mfE +qkF ibx kxP fsf @@ -65616,7 +65621,7 @@ xeT knH mfE wTU -mfE +qkF ilB kxP hvm