From 111ca143245eb0dd252e36a2918daf7749c8ee62 Mon Sep 17 00:00:00 2001 From: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Date: Tue, 17 Dec 2024 23:58:32 -0500 Subject: [PATCH 1/7] turns off heaters in atmos, introduces new area for atmos desk --- _maps/map_files/stations/deltastation.dmm | 240 ++++++++++-------- .../game/area/ss13_areas/engineering_areas.dm | 4 + 2 files changed, 136 insertions(+), 108 deletions(-) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 19e2fe2d79ce..887aa20d8288 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -14079,7 +14079,7 @@ }, /area/station/service/kitchen) "aYD" = ( -/obj/machinery/atmospherics/unary/thermomachine/heater/on{ +/obj/machinery/atmospherics/unary/thermomachine/heater{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -16118,7 +16118,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bfw" = ( /obj/machinery/light{ dir = 1 @@ -18519,7 +18519,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bmO" = ( /obj/structure/table, /obj/item/storage/box/prisoner, @@ -19431,7 +19431,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bpS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -19942,17 +19942,17 @@ /obj/machinery/space_heater, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "brO" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "brP" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "brR" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/structure/sign/nosmoking_2{ @@ -19960,7 +19960,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "brS" = ( /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) @@ -20404,7 +20404,7 @@ }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "btt" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/structure/cable{ @@ -20415,7 +20415,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "btu" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/structure/cable{ @@ -20427,17 +20427,17 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "btv" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "btw" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "btx" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20705,14 +20705,11 @@ dir = 1 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "buE" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -20720,8 +20717,11 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "buF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20744,23 +20744,14 @@ /obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/control) -"buI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/station/hallway/primary/port/north) "buJ" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 1 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -21021,7 +21012,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bvO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21029,7 +21020,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bvP" = ( /obj/structure/cable{ icon_state = "1-2" @@ -21038,22 +21029,31 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bvR" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bvT" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/north) "bvV" = ( @@ -21407,14 +21407,14 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bxc" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bxe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -21862,7 +21862,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "byB" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -21876,7 +21876,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "byC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21887,7 +21887,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "byD" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -21902,7 +21902,7 @@ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "byF" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -22353,7 +22353,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bzY" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -22361,13 +22361,13 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bzZ" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bAa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22385,7 +22385,7 @@ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bAd" = ( /obj/structure/urinal{ pixel_y = 28 @@ -22860,7 +22860,7 @@ dir = 10; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bBK" = ( /obj/machinery/alarm/directional/south, /obj/machinery/computer/station_alert{ @@ -22869,7 +22869,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bBL" = ( /obj/machinery/light, /obj/machinery/computer/atmos_alert{ @@ -22879,7 +22879,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bBM" = ( /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen, @@ -22890,7 +22890,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bBN" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -22903,7 +22903,7 @@ dir = 6; icon_state = "caution" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "bBO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -51267,7 +51267,7 @@ }, /obj/machinery/door/window{ dir = 8; - name = "Atmospherics Desk" + name = "Atmospherics Cannister Storage" }, /obj/effect/mapping_helpers/airlock/windoor/access/any/engineering/atmos{ dir = 8 @@ -51282,7 +51282,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "dxD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52082,6 +52082,10 @@ icon_state = "neutral" }, /area/station/maintenance/apmaint) +"dCK" = ( +/obj/machinery/status_display, +/turf/simulated/wall/r_wall, +/area/station/engineering/atmos/cannisterstorage) "dCU" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -59063,6 +59067,10 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/theatre) +"fvB" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/station/engineering/atmos/cannisterstorage) "fvQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59963,6 +59971,17 @@ /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/engineering/smes) +"fQW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc/important/directional/east, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos/cannisterstorage) "fRa" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -60026,12 +60045,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 5 - }, /obj/structure/disposalpipe/sortjunction{ sort_type_txt = "6" }, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -60305,9 +60322,7 @@ /turf/simulated/floor/plating, /area/station/engineering/controlroom) "gdm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/structure/railing, /turf/simulated/floor/engine, /area/station/science/testrange) @@ -64647,16 +64662,6 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/expedition) -"iFv" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/station/engineering/atmos) "iFB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -67446,6 +67451,11 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"kmY" = ( +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/atmos/cannisterstorage) "kna" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -69416,8 +69426,11 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/engineering/atmos{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "ltY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -75345,7 +75358,7 @@ "oLu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Desk" + name = "Atmospherics Cannister Storage" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/structure/cable{ @@ -75355,7 +75368,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "oLv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -77107,7 +77120,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "pHd" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -79094,7 +79107,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "qQv" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -79949,9 +79962,6 @@ /turf/simulated/floor/plasteel, /area/station/security/brig) "rke" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -79959,7 +79969,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "rkt" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/bluegrid{ @@ -80384,6 +80394,9 @@ icon_state = "dark" }, /area/station/security/prisonershuttle) +"rvv" = ( +/turf/simulated/wall/r_wall, +/area/station/engineering/atmos/cannisterstorage) "rvx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -82972,7 +82985,7 @@ /obj/structure/cable, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/engineering/atmos) +/area/station/engineering/atmos/cannisterstorage) "sIB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -86480,6 +86493,17 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/service/chapel) +"uvO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/atmos/cannisterstorage) "uwm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -120478,17 +120502,17 @@ jgG mzZ osF bmI -aOg -aOg -aOb +rvv +rvv +fvB oLu bmN -aOg -aOg -aOg -aOg -aOg -aOg +rvv +rvv +rvv +rvv +rvv +rvv bFb bGI bIA @@ -120735,7 +120759,7 @@ emu ban osF bmJ -aOg +rvv brN brN bts @@ -120745,7 +120769,7 @@ bxb byz bzX bBJ -aOg +rvv bFc bGH bIF @@ -120992,17 +121016,17 @@ vnK bhp bkN bmK -aOg +rvv brO brO btt buD bvO -ban +kmY bzY bzY bBK -aOg +rvv byl kWX byl @@ -121249,7 +121273,7 @@ jJc biZ bkO aQZ -aOg +rvv bpQ brP btu @@ -121259,7 +121283,7 @@ bfv byB bzZ bBL -aOg +rvv bFd bGK bID @@ -121506,17 +121530,17 @@ bhr bja bkP bmM -aOg +rvv btv btv btv rke -bvO -ban +uvO +kmY byC pGT bBM -aOg +rvv bFe bGM kIs @@ -121763,17 +121787,17 @@ rcz qJW aOg keu -aOg +rvv btw brR btw -rke +fQW bvR bxc byD bAb bBN -aOg +rvv bFf bGL bII @@ -122020,17 +122044,17 @@ aSM buX bkQ aOW -aOg -aOg -aOg -bvK -iFv +rvv +rvv +rvv +dCK +rvv ltX qPT dxC sIz -aOg -aOg +rvv +rvv naB xcs mvr @@ -122281,7 +122305,7 @@ bcP bpU bty bty -buI +bty bvT bty byF diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm index e47e128bffa9..107a0b97f786 100644 --- a/code/game/area/ss13_areas/engineering_areas.dm +++ b/code/game/area/ss13_areas/engineering_areas.dm @@ -38,6 +38,10 @@ icon_state = "asteroid_core" dynamic_lighting = DYNAMIC_LIGHTING_FORCED sound_environment = SOUND_AREA_ASTEROID + +/area/station/engineering/atmos/cannisterstorage + name = "Atmospherics Cannister Storage" + icon_state = "atmos" // general engineering /area/station/engineering From 298bbca6f607cfe9fe681afec42b53ee1f583f2f Mon Sep 17 00:00:00 2001 From: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Date: Wed, 18 Dec 2024 00:46:46 -0500 Subject: [PATCH 2/7] fixes overlapping pipes --- _maps/map_files/stations/deltastation.dmm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 887aa20d8288..f3476ba6484a 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -20717,9 +20717,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/cannisterstorage) "buF" = ( @@ -21017,6 +21014,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -21030,7 +21030,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -89432,6 +89432,15 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central) +"wbs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos/cannisterstorage) "wbZ" = ( /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plasteel{ @@ -121020,7 +121029,7 @@ rvv brO brO btt -buD +wbs bvO kmY bzY From 2c95f7056e5cb2e5b4ea57e0bc097d439c676e08 Mon Sep 17 00:00:00 2001 From: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:16:43 -0500 Subject: [PATCH 3/7] changed the spelling of canister Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> --- code/game/area/ss13_areas/engineering_areas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm index 107a0b97f786..576e8cecf28c 100644 --- a/code/game/area/ss13_areas/engineering_areas.dm +++ b/code/game/area/ss13_areas/engineering_areas.dm @@ -39,7 +39,7 @@ dynamic_lighting = DYNAMIC_LIGHTING_FORCED sound_environment = SOUND_AREA_ASTEROID -/area/station/engineering/atmos/cannisterstorage +/area/station/engineering/atmos/canister_storage name = "Atmospherics Cannister Storage" icon_state = "atmos" From 5c36cfb24d6484f2b8cc880be4a993dcdfef0d1d Mon Sep 17 00:00:00 2001 From: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:16:57 -0500 Subject: [PATCH 4/7] changed the spelling of canister Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> --- code/game/area/ss13_areas/engineering_areas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm index 576e8cecf28c..4de628586e85 100644 --- a/code/game/area/ss13_areas/engineering_areas.dm +++ b/code/game/area/ss13_areas/engineering_areas.dm @@ -40,7 +40,7 @@ sound_environment = SOUND_AREA_ASTEROID /area/station/engineering/atmos/canister_storage - name = "Atmospherics Cannister Storage" + name = "Atmospherics Canister Storage" icon_state = "atmos" // general engineering From 50d42b87001ae137d8691ce156769677c1c3c04e Mon Sep 17 00:00:00 2001 From: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:38:53 -0500 Subject: [PATCH 5/7] fixes the spelling of canister --- _maps/map_files/stations/deltastation.dmm | 94 +++++++++++------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index f3476ba6484a..8ff509adc1bd 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -16118,7 +16118,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bfw" = ( /obj/machinery/light{ dir = 1 @@ -18519,7 +18519,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bmO" = ( /obj/structure/table, /obj/item/storage/box/prisoner, @@ -19431,7 +19431,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bpS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -19942,17 +19942,17 @@ /obj/machinery/space_heater, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "brO" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "brP" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "brR" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/structure/sign/nosmoking_2{ @@ -19960,7 +19960,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "brS" = ( /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) @@ -20404,7 +20404,7 @@ }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "btt" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/structure/cable{ @@ -20415,7 +20415,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "btu" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/structure/cable{ @@ -20427,17 +20427,17 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "btv" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "btw" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "btx" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20705,7 +20705,7 @@ dir = 1 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "buE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20718,7 +20718,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "buF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21009,7 +21009,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bvO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21020,7 +21020,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bvP" = ( /obj/structure/cable{ icon_state = "1-2" @@ -21035,7 +21035,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bvR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21045,7 +21045,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bvT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21407,14 +21407,14 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bxc" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bxe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -21862,7 +21862,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "byB" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -21876,7 +21876,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "byC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21887,7 +21887,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "byD" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -21902,7 +21902,7 @@ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "byF" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -22353,7 +22353,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bzY" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -22361,13 +22361,13 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bzZ" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bAa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22385,7 +22385,7 @@ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bAd" = ( /obj/structure/urinal{ pixel_y = 28 @@ -22860,7 +22860,7 @@ dir = 10; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bBK" = ( /obj/machinery/alarm/directional/south, /obj/machinery/computer/station_alert{ @@ -22869,7 +22869,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bBL" = ( /obj/machinery/light, /obj/machinery/computer/atmos_alert{ @@ -22879,7 +22879,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bBM" = ( /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen, @@ -22890,7 +22890,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bBN" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -22903,7 +22903,7 @@ dir = 6; icon_state = "caution" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "bBO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -51282,7 +51282,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "dxD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52085,7 +52085,7 @@ "dCK" = ( /obj/machinery/status_display, /turf/simulated/wall/r_wall, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "dCU" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -59070,7 +59070,7 @@ "fvB" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "fvQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59981,7 +59981,7 @@ }, /obj/machinery/power/apc/important/directional/east, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "fRa" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -67455,7 +67455,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "kna" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -69430,7 +69430,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "ltY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -75368,7 +75368,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "oLv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -77120,7 +77120,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "pHd" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -79107,7 +79107,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "qQv" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -79969,7 +79969,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "rkt" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/bluegrid{ @@ -80396,7 +80396,7 @@ /area/station/security/prisonershuttle) "rvv" = ( /turf/simulated/wall/r_wall, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "rvx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -82985,7 +82985,7 @@ /obj/structure/cable, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "sIB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -86503,7 +86503,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "uwm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -89440,7 +89440,7 @@ dir = 10 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/cannisterstorage) +/area/station/engineering/atmos/canisterstorage) "wbZ" = ( /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plasteel{ From b7f08311c6ba5fcff06dcfe7feb97059c27a40c9 Mon Sep 17 00:00:00 2001 From: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:45:36 -0500 Subject: [PATCH 6/7] fixes the canister storage area --- _maps/map_files/stations/deltastation.dmm | 94 +++++++++++------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 8ff509adc1bd..a05dca8999b8 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -16118,7 +16118,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bfw" = ( /obj/machinery/light{ dir = 1 @@ -18519,7 +18519,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bmO" = ( /obj/structure/table, /obj/item/storage/box/prisoner, @@ -19431,7 +19431,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bpS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -19942,17 +19942,17 @@ /obj/machinery/space_heater, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "brO" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "brP" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "brR" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/structure/sign/nosmoking_2{ @@ -19960,7 +19960,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "brS" = ( /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) @@ -20404,7 +20404,7 @@ }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "btt" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/structure/cable{ @@ -20415,7 +20415,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "btu" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/structure/cable{ @@ -20427,17 +20427,17 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "btv" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "btw" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "btx" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20705,7 +20705,7 @@ dir = 1 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "buE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20718,7 +20718,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "buF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21009,7 +21009,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bvO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21020,7 +21020,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bvP" = ( /obj/structure/cable{ icon_state = "1-2" @@ -21035,7 +21035,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bvR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21045,7 +21045,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bvT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21407,14 +21407,14 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bxc" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bxe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -21862,7 +21862,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "byB" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -21876,7 +21876,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "byC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21887,7 +21887,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "byD" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -21902,7 +21902,7 @@ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "byF" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -22353,7 +22353,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bzY" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -22361,13 +22361,13 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bzZ" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bAa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22385,7 +22385,7 @@ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bAd" = ( /obj/structure/urinal{ pixel_y = 28 @@ -22860,7 +22860,7 @@ dir = 10; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bBK" = ( /obj/machinery/alarm/directional/south, /obj/machinery/computer/station_alert{ @@ -22869,7 +22869,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bBL" = ( /obj/machinery/light, /obj/machinery/computer/atmos_alert{ @@ -22879,7 +22879,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bBM" = ( /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen, @@ -22890,7 +22890,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bBN" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -22903,7 +22903,7 @@ dir = 6; icon_state = "caution" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "bBO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -51282,7 +51282,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "dxD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52085,7 +52085,7 @@ "dCK" = ( /obj/machinery/status_display, /turf/simulated/wall/r_wall, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "dCU" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -59070,7 +59070,7 @@ "fvB" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "fvQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59981,7 +59981,7 @@ }, /obj/machinery/power/apc/important/directional/east, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "fRa" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -67455,7 +67455,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "kna" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -69430,7 +69430,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "ltY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -75368,7 +75368,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "oLv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -77120,7 +77120,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "pHd" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -79107,7 +79107,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "qQv" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -79969,7 +79969,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "rkt" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/bluegrid{ @@ -80396,7 +80396,7 @@ /area/station/security/prisonershuttle) "rvv" = ( /turf/simulated/wall/r_wall, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "rvx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -82985,7 +82985,7 @@ /obj/structure/cable, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "sIB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -86503,7 +86503,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "uwm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -89440,7 +89440,7 @@ dir = 10 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canisterstorage) +/area/station/engineering/atmos/canister_storage) "wbZ" = ( /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plasteel{ From 137ffa12a8cc75d6ba40409f894f3d84a6b0ce9e Mon Sep 17 00:00:00 2001 From: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Date: Thu, 16 Jan 2025 16:58:55 -0500 Subject: [PATCH 7/7] updated stuff and removed an unneeded area --- _maps/map_files/stations/deltastation.dmm | 94 +++++++++---------- .../game/area/ss13_areas/engineering_areas.dm | 4 - 2 files changed, 47 insertions(+), 51 deletions(-) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 12c74f367099..e4ce74edb2fb 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -16100,7 +16100,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bfw" = ( /obj/machinery/light{ dir = 1 @@ -18501,7 +18501,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bmO" = ( /obj/structure/table, /obj/item/storage/box/prisoner, @@ -19413,7 +19413,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bpS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -19924,17 +19924,17 @@ /obj/machinery/space_heater, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "brO" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "brP" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "brR" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/structure/sign/nosmoking_2{ @@ -19942,7 +19942,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "brS" = ( /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) @@ -20384,7 +20384,7 @@ }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "btt" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/structure/cable{ @@ -20395,7 +20395,7 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "btu" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, /obj/structure/cable{ @@ -20407,17 +20407,17 @@ }, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "btv" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "btw" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "btx" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20701,7 +20701,7 @@ dir = 1 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "buE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20714,7 +20714,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "buF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21005,7 +21005,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bvO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21016,7 +21016,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bvP" = ( /obj/structure/cable{ icon_state = "1-2" @@ -21031,7 +21031,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bvR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21041,7 +21041,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bvT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21403,14 +21403,14 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bxc" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bxe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -21858,7 +21858,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "byB" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -21872,7 +21872,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "byC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21883,7 +21883,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "byD" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -21898,7 +21898,7 @@ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "byF" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -22349,7 +22349,7 @@ dir = 8; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bzY" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -22357,13 +22357,13 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bzZ" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bAa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22381,7 +22381,7 @@ dir = 4; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bAd" = ( /obj/structure/urinal{ pixel_y = 28 @@ -22856,7 +22856,7 @@ dir = 10; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bBK" = ( /obj/machinery/alarm/directional/south, /obj/machinery/computer/station_alert{ @@ -22865,7 +22865,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bBL" = ( /obj/machinery/light, /obj/machinery/computer/atmos_alert{ @@ -22875,7 +22875,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bBM" = ( /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen, @@ -22886,7 +22886,7 @@ /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bBN" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -22899,7 +22899,7 @@ dir = 6; icon_state = "caution" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "bBO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -51174,7 +51174,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "dxD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -51971,7 +51971,7 @@ "dCK" = ( /obj/machinery/status_display, /turf/simulated/wall/r_wall, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "dCU" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -58982,7 +58982,7 @@ "fvB" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "fvQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59876,7 +59876,7 @@ }, /obj/machinery/power/apc/important/directional/east, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "fRa" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -67323,7 +67323,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "kna" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -69323,7 +69323,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "ltY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -75198,7 +75198,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "oLv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -76937,7 +76937,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "pHd" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -78911,7 +78911,7 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "qQv" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -79773,7 +79773,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "rkt" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/bluegrid{ @@ -80200,7 +80200,7 @@ /area/station/security/prisonershuttle) "rvv" = ( /turf/simulated/wall/r_wall, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "rvx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -82776,7 +82776,7 @@ /obj/structure/cable, /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "sIB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -86286,7 +86286,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "uwm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -89242,7 +89242,7 @@ dir = 10 }, /turf/simulated/floor/plasteel, -/area/station/engineering/atmos/canister_storage) +/area/station/engineering/atmos/control) "wbZ" = ( /obj/machinery/atmospherics/unary/portables_connector, /turf/simulated/floor/plasteel{ diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm index 4de628586e85..e47e128bffa9 100644 --- a/code/game/area/ss13_areas/engineering_areas.dm +++ b/code/game/area/ss13_areas/engineering_areas.dm @@ -38,10 +38,6 @@ icon_state = "asteroid_core" dynamic_lighting = DYNAMIC_LIGHTING_FORCED sound_environment = SOUND_AREA_ASTEROID - -/area/station/engineering/atmos/canister_storage - name = "Atmospherics Canister Storage" - icon_state = "atmos" // general engineering /area/station/engineering