From e3d1ad2b906be7f44f426d0206fe977063ab4f7b Mon Sep 17 00:00:00 2001 From: Greenpoison Date: Sun, 26 Oct 2025 11:53:43 +0000 Subject: [PATCH 1/4] Roundstart Atmos adjustments --- _maps/map_files/Blueshift/Blueshift.dmm | 371 +++---------- _maps/map_files/BoxStation/BoxStation.dmm | 256 ++++----- .../map_files/Deltastation/DeltaStation2.dmm | 451 +++++----------- _maps/map_files/Graveyard/Graveyard.dmm | 142 ++--- _maps/map_files/Heliostation/Heliostation.dmm | 248 ++------- .../map_files/IceBoxStation/IceBoxStation.dmm | 456 +++------------- _maps/map_files/KiloStation/KiloStation.dmm | 337 +++--------- .../LeadPoisoningStation.dmm | 57 +- _maps/map_files/MetaStation/MetaStation.dmm | 421 +++------------ _maps/map_files/Ouroboros/Ouroboros.dmm | 12 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 132 +---- _maps/map_files/Theseus/Theseus.dmm | 506 +++--------------- _maps/map_files/Voidraptor/VoidRaptor.dmm | 312 ++--------- _maps/map_files/tramstation/tramstation.dmm | 211 ++------ 14 files changed, 833 insertions(+), 3079 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 47a91091546d1..6b48ef1b8710d 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -551,7 +551,7 @@ /turf/open/floor/plating, /area/station/maintenance/aft/upper) "agb" = ( -/obj/machinery/vending/wardrobe/atmos_wardrobe, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "agc" = ( @@ -7703,6 +7703,7 @@ /obj/item/stock_parts/power_store/cell/high{ pixel_y = -4 }, +/obj/item/circuitboard/machine/thermomachine, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) "byC" = ( @@ -9209,13 +9210,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"bNO" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/test_chambers) "bNQ" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -10833,9 +10827,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/upper) "cdE" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 10 - }, /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -12640,9 +12631,6 @@ /area/station/engineering/supermatter/room) "cuE" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/test_chambers) "cuH" = ( @@ -16213,12 +16201,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"dbE" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/test_chambers) "dbJ" = ( /turf/open/floor/iron/dark/side{ dir = 6 @@ -21413,10 +21395,6 @@ /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) "eeE" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 8 - }, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -22289,13 +22267,6 @@ "emO" = ( /turf/closed/wall/r_wall, /area/station/maintenance/console_room) -"end" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "enh" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/water_cooler, @@ -22345,10 +22316,6 @@ /obj/structure/urinal/directional/west, /turf/open/floor/iron/cafeteria, /area/station/commons/toilet/auxiliary) -"eof" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/test_chambers) "eoj" = ( /obj/structure/table, /obj/item/folder/white{ @@ -22485,9 +22452,8 @@ /turf/open/floor/iron/white, /area/station/medical/patients_rooms) "epH" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 +/obj/machinery/atmospherics/components/binary/crystallizer{ + dir = 4 }, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) @@ -24462,7 +24428,11 @@ /area/station/hallway/primary/upper) "eGO" = ( /obj/structure/table, -/obj/item/circuitboard/machine/thermomachine, +/obj/item/storage/bag/construction, +/obj/item/storage/bag/construction, +/obj/item/storage/bag/construction, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) "eGR" = ( @@ -28831,9 +28801,6 @@ /turf/open/floor/engine, /area/station/command/heads_quarters/rd) "fyk" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/effect/turf_decal/stripes/end{ dir = 8 }, @@ -29573,9 +29540,9 @@ /turf/open/floor/iron/cafeteria, /area/station/engineering/atmos) "fHR" = ( -/obj/item/kirbyplants/random, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/iron, /area/station/engineering/atmos/office) "fHX" = ( @@ -29947,12 +29914,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"fLS" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "fLW" = ( /turf/closed/wall/r_wall, /area/station/security/prison/work) @@ -37437,7 +37398,6 @@ /turf/open/floor/iron/smooth_large, /area/station/cargo/miningdock) "hjp" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/test_chambers) @@ -39003,15 +38963,6 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"hAJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/stairs/medium, -/area/station/engineering/atmos/test_chambers) "hAL" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/effect/turf_decal/bot, @@ -39792,10 +39743,6 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"hIj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hIo" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -39975,15 +39922,6 @@ "hJH" = ( /turf/closed/wall, /area/station/maintenance/fore/upper) -"hJL" = ( -/obj/structure/table, -/obj/structure/cable, -/obj/item/storage/bag/construction, -/obj/item/storage/bag/construction, -/obj/item/storage/bag/construction, -/obj/item/stack/sheet/iron/fifty, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/test_chambers) "hJR" = ( /turf/closed/wall, /area/station/science/research) @@ -41485,10 +41423,6 @@ dir = 1 }, /area/station/security/brig) -"hYG" = ( -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/engineering/atmos/test_chambers) "hYI" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -43442,10 +43376,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "isg" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer, /turf/open/floor/iron/dark, /area/station/engineering/atmos/test_chambers) "isi" = ( @@ -48182,12 +48114,6 @@ }, /turf/open/floor/iron, /area/station/medical/psychology) -"jqa" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "jqe" = ( /obj/structure/railing, /obj/machinery/door/firedoor/border_only, @@ -50534,12 +50460,6 @@ /obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/wood, /area/station/service/bar/atrium) -"jMW" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Air to Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "jMZ" = ( /obj/structure/chair, /obj/effect/turf_decal/bot, @@ -51657,15 +51577,25 @@ dir = 4 }, /obj/structure/rack, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, +/obj/item/storage/toolbox/electrical{ + pixel_y = 12 + }, +/obj/item/electronics/firealarm{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/electronics/firealarm{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/electronics/airalarm{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/electronics/airalarm{ + pixel_x = -5; + pixel_y = -5 + }, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) "jWi" = ( @@ -51760,6 +51690,7 @@ }, /obj/structure/fireaxecabinet/directional/west, /obj/machinery/duct, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) "jXG" = ( @@ -57899,13 +57830,17 @@ /turf/open/floor/plating, /area/station/maintenance/department/security/greater) "lfK" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/stairs/medium{ - dir = 4 - }, +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) "lfM" = ( /obj/effect/turf_decal/stripes{ @@ -61496,12 +61431,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/barber) -"lQB" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "To Port" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lQD" = ( /obj/structure/table/wood/fancy/royalblue, /obj/item/stack/spacecash/c500, @@ -61937,12 +61866,6 @@ /obj/structure/cable, /turf/open/floor/eighties/red, /area/station/common/arcade) -"lUF" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "lUG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66903,11 +66826,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/office) -"mTU" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/test_chambers) "mTW" = ( /obj/machinery/door/airlock/maintenance{ name = "Janitorial Closet" @@ -69704,13 +69622,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet, /area/station/service/theater/abandoned) -"nyl" = ( -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "nyo" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, @@ -73569,10 +73480,6 @@ dir = 4 }, /area/station/hallway/primary/port) -"oki" = ( -/obj/machinery/atmospherics/components/binary/pump, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "okl" = ( /obj/item/kirbyplants/organic/plant21, /turf/open/floor/iron, @@ -83058,8 +82965,6 @@ /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit/departure_lounge) "qce" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible, -/obj/machinery/meter, /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -83319,9 +83224,6 @@ /turf/open/floor/iron/dark, /area/station/commons/storage/primary) "qeW" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister, /obj/machinery/duct, /turf/open/floor/iron/dark, @@ -83333,8 +83235,6 @@ /turf/open/floor/iron/dark/small, /area/station/cargo/storage) "qfd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) "qfl" = ( @@ -83604,17 +83504,6 @@ dir = 4 }, /area/station/cargo/storage) -"qhu" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/stairs/medium{ - dir = 1 - }, -/area/station/engineering/atmos/test_chambers) "qhz" = ( /turf/open/floor/iron/stairs/left, /area/station/maintenance/port/upper) @@ -84082,9 +83971,9 @@ /turf/open/floor/plating, /area/station/maintenance/central) "qmT" = ( -/obj/item/kirbyplants/random, /obj/machinery/light/directional/west, /obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) "qmW" = ( @@ -88620,12 +88509,6 @@ /obj/effect/turf_decal/tile/red/real_red/diagonal_centre, /turf/open/floor/iron, /area/station/engineering/atmos) -"rew" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rex" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -88786,12 +88669,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"rgd" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "rgg" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, @@ -88864,9 +88741,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/engineering/lesser) "rgW" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/effect/turf_decal/stripes{ dir = 1 }, @@ -95231,12 +95105,6 @@ /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"stR" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Pure to Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "stV" = ( /obj/machinery/light_switch/directional/east, /turf/open/floor/carpet/black, @@ -102370,10 +102238,6 @@ }, /turf/open/floor/plating, /area/station/hallway/primary/port) -"tKQ" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "tKU" = ( /obj/structure/table/wood, /obj/item/clipboard{ @@ -106480,13 +106344,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/security/execution/education) -"uxW" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/trinary/mixer/flipped{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/test_chambers) "uyi" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/table/rolling, @@ -109761,7 +109618,6 @@ /turf/closed/wall, /area/station/maintenance/port/central) "veU" = ( -/obj/item/kirbyplants/random, /obj/machinery/light/directional/east, /obj/machinery/duct, /turf/open/floor/iron, @@ -116054,12 +115910,6 @@ /obj/machinery/duct, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) -"wlM" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/test_chambers) "wlO" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -116349,9 +116199,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/engineering/lesser) "wpg" = ( -/obj/machinery/atmospherics/components/binary/crystallizer{ - dir = 4 - }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) @@ -117540,15 +117387,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"wAb" = ( -/obj/structure/cable, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/stairs{ - dir = 1 - }, -/area/station/engineering/atmos/test_chambers) "wAc" = ( /obj/structure/table, /obj/item/storage/belt/utility, @@ -120681,15 +120519,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"xgs" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/stairs/medium{ - dir = 8 - }, -/area/station/engineering/atmos/test_chambers) "xgv" = ( /obj/structure/cable, /obj/effect/landmark/event_spawn, @@ -122497,10 +122326,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"xyi" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "xyx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance, @@ -122698,9 +122523,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "xBs" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/effect/turf_decal/stripes/end{ dir = 4 }, @@ -122969,12 +122791,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"xDM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xDN" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 8 @@ -125894,29 +125710,6 @@ /obj/machinery/growing/tray, /turf/open/floor/grass, /area/station/security/prison/garden) -"ygq" = ( -/obj/structure/table, -/obj/item/storage/toolbox/electrical{ - pixel_y = 12 - }, -/obj/item/electronics/airalarm{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/electronics/firealarm{ - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/electronics/firealarm{ - pixel_x = 5 - }, -/obj/item/electronics/airalarm{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/stack/sheet/plasteel/fifty, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/test_chambers) "ygx" = ( /obj/structure/window/spawner/directional/south, /obj/machinery/modular_computer/preset/cargochat/service{ @@ -159381,10 +159174,10 @@ oky eYP oxX qdj -jqa -hIj -lQB -xDM +qfd +qfd +qfd +qfd fyk mhJ gky @@ -159638,7 +159431,7 @@ aTe ooG wvV mIx -jMW +qfd qce csn qfd @@ -159895,10 +159688,10 @@ eyO mEg bTt eCi -stR -rew -lQB -hIj +qfd +qfd +qfd +qfd xBs mhJ lIn @@ -163249,7 +163042,7 @@ wSf vLv fkL qmT -xcP +isg isg jXB qeW @@ -163506,18 +163299,18 @@ akL vLv fZH lZe -mTU +onq cuE vhR -uxW -wlM +cuE +onq sQQ biL sQQ lmd lmd lmd -xgs +lmd lmd lmd lmd @@ -163764,9 +163557,9 @@ oCM gzG hYS onq -dbE +onq sQQ -dbE +onq onq sQQ biL @@ -164029,10 +163822,10 @@ sQQ biL sQQ lmd -nyl -xyi -epH -fLS +eeE +sQQ +sQQ +sQQ sQQ lmd sQQ @@ -164278,20 +164071,20 @@ jzt sLj cnV biL -hJL hjp -bNO +hjp +hjp biL biL biL sQQ -qhu +lmd sQQ sQQ wpg pET vhR -hAJ +lmd sQQ sQQ sQQ @@ -164543,11 +164336,11 @@ sQQ biL sQQ lmd -tKQ -oki -end -rgd -lUF +sQQ +sQQ +sQQ +sQQ +sQQ lmd sQQ sQQ @@ -164797,7 +164590,7 @@ sQQ ovY sQQ sQQ -hYG +biL sQQ lmd vFr @@ -165054,12 +164847,12 @@ sQQ sQQ sQQ sQQ -hYG +biL sQQ lmd lmd lmd -lfK +lmd lmd lmd lmd @@ -165306,12 +165099,12 @@ vLv cyC veU cnV -ygq -eof -wlM +onq +onq +onq sQQ sQQ -hYG +biL sQQ sQQ des @@ -165570,7 +165363,7 @@ sQQ vif hnh oDe -sQQ +lfK fth vwS vwS @@ -165827,7 +165620,7 @@ aSG xcO nZT tQx -wAb +biL bmP laI aCo @@ -166089,7 +165882,7 @@ fth slR cIK vwS -sQQ +epH vLv vLv vLv diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index a51f88b68c4bc..e19b676f47510 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -4873,12 +4873,6 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron, /area/station/science/ordnance) -"bAX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "bBd" = ( /obj/structure/cable, /obj/structure/chair/office{ @@ -5055,12 +5049,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/station/solars/starboard/aft) -"bDY" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to Ports" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "bEa" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5212,13 +5200,6 @@ }, /turf/open/floor/wood, /area/station/commons/locker) -"bGO" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Ports to Port Mix"; - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "bGX" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -6554,11 +6535,11 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "ccW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/turf/closed/wall/r_wall, +/area/station/maintenance/department/engineering/central) "ccZ" = ( /obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 1 @@ -6667,11 +6648,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) -"cdI" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "cdN" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -7851,9 +7827,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "czt" = ( @@ -16891,12 +16864,6 @@ }, /turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) -"fwt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "fwv" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -21038,6 +21005,7 @@ /obj/effect/mapping_helpers/apc/cell_10k, /obj/effect/mapping_helpers/apc/full_charge, /obj/machinery/suit_storage_unit/atmos, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "gLa" = ( @@ -25784,6 +25752,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/light/directional/west, /obj/machinery/space_heater, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "imG" = ( @@ -28157,12 +28126,11 @@ }, /area/station/commons/fitness) "iZB" = ( -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 8; - name = "Turbine to Waste" +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/turf/closed/wall/r_wall, +/area/station/maintenance/department/engineering/central) "iZD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/wood, @@ -33255,6 +33223,9 @@ /obj/effect/turf_decal/bot, /obj/machinery/airalarm/directional/west, /obj/structure/tank_dispenser, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "kIQ" = ( @@ -38387,12 +38358,6 @@ "mnA" = ( /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"mnW" = ( -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mnY" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 @@ -42190,13 +42155,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/engine, /area/station/science/xenobiology) -"nzT" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "nzX" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43279,6 +43237,7 @@ "nRD" = ( /obj/effect/turf_decal/bot, /obj/machinery/space_heater, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "nRV" = ( @@ -45901,13 +45860,6 @@ /obj/effect/landmark/navigate_destination, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/hop) -"oKE" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "oKM" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -52104,10 +52056,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "qNN" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 4 - }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "qNW" = ( @@ -52515,13 +52464,6 @@ /obj/structure/sign/warning/radiation/directional/north, /turf/open/space/basic, /area/space/nearstation) -"qUp" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "qUs" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/machinery/computer/robotics{ @@ -54051,9 +53993,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, -/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "rwf" = ( @@ -54135,7 +54075,7 @@ "rxk" = ( /obj/machinery/light/small/directional/south, /obj/machinery/camera/autoname/directional/south, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -54145,11 +54085,11 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "rxo" = ( -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 5 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/turf/closed/wall/r_wall, +/area/station/maintenance/department/engineering/central) "rxs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54776,6 +54716,7 @@ /obj/effect/turf_decal/bot, /obj/item/radio/intercom/directional/west, /obj/machinery/suit_storage_unit/atmos, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "rFb" = ( @@ -56920,12 +56861,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"spG" = ( -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "sqj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair{ @@ -58881,6 +58816,7 @@ id = "atmos_rad_shutters"; name = "Radiation Shutters" }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/station/maintenance/department/engineering/central) "sXS" = ( @@ -59875,7 +59811,6 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/department/engine) "toD" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 4 }, @@ -60764,10 +60699,10 @@ /area/station/maintenance/starboard/aft) "tAZ" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "tBh" = ( @@ -61139,11 +61074,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/engineering/shipbreaker_hut) -"tJu" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "tJy" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -65458,6 +65388,7 @@ "vbi" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/bluespace_sender, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "vbl" = ( @@ -68252,12 +68183,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) -"vQE" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "vQV" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -69788,6 +69713,7 @@ "woE" = ( /obj/effect/turf_decal/bot, /obj/machinery/suit_storage_unit/atmos, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "woV" = ( @@ -71536,6 +71462,7 @@ "wSn" = ( /obj/effect/turf_decal/bot, /obj/machinery/pipedispenser/disposal, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "wSs" = ( @@ -73369,12 +73296,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "xzf" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to Waste"; - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/maintenance/department/engineering/central) "xzm" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -108162,7 +108086,7 @@ vbi wSn imB nRD -xOH +rxo oyS jlE fHc @@ -108411,15 +108335,15 @@ aSs fDD jSP gkZ -pfo +fwd bXv pfo pfo pfo -pfo -pfo -pfo -xOH +qNN +qNN +qNN +ccW bCy bCy bCy @@ -108673,20 +108597,20 @@ kch pfo pfo pfo -pfo -pfo -pfo -xOH +qNN +qNN +qNN +iZB sXO sXO sXO -xOH -xOH -xOH -xOH -xOH -xOH -xOH +xzf +xzf +xzf +xzf +xzf +xzf +rxo xOH hfI xOH @@ -108925,7 +108849,7 @@ bXv qay moK gkZ -vQE +pfo sSP pfo pfo @@ -108943,7 +108867,7 @@ kvL pfo rhD pfo -pfo +gZC gzZ dFW wCX @@ -109182,7 +109106,7 @@ bXv iiR sWS gkZ -fwd +pfo cLo bXv bXv @@ -109200,7 +109124,7 @@ pfo pfo pfo pfo -pfo +gZC gzZ dyE goP @@ -109441,23 +109365,23 @@ llH llH rfB toD -yjP -bAX -yjP -yjP -yjP -yjP -yjP -tJu -yjP -yjP -yjP -yjP -yjP -yjP -yjP -yjP -wwQ +pfo +pfo +pfo +pfo +pfo +pfo +pfo +bXv +pfo +pfo +pfo +pfo +pfo +pfo +pfo +pfo +gZC mdp dFW dFW @@ -109699,11 +109623,11 @@ lGd qKy dgR pfo -xzf pfo -qUp -qUp -qUp +pfo +pfo +pfo +pfo pfo cSQ pfo @@ -109956,12 +109880,12 @@ ryX lMb vkL xDl -xny -bGO -ccW -qNN -ccW -spG +pfo +pfo +pfo +pfo +pfo +pfo bXv pfo pfo @@ -110213,12 +110137,12 @@ bHT xHp yjc aoc -cdI +pfo pfo pfo pfo ulR -rxo +pfo wJm pfo pfo @@ -110471,11 +110395,11 @@ joY nlI xgo xny -bDY -fwt -nzT -fwt -mnW +pfo +pfo +pfo +pfo +pfo pfo pfo pfo @@ -110729,9 +110653,6 @@ pfo pfo vEP pfo -oKE -oKE -oKE pfo pfo pfo @@ -110742,7 +110663,10 @@ pfo pfo pfo pfo -iZB +pfo +pfo +pfo +pfo pfo pfo pfo diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d414bfb1b68e5..eef6375a37cc5 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1167,14 +1167,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"anp" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ant" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1929,11 +1921,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"aul" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "aux" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/cyborg, @@ -3395,12 +3382,13 @@ /turf/open/floor/iron/dark, /area/station/science/xenobiology) "aLN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 4 +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/light/directional/north, /turf/open/floor/iron, -/area/station/engineering/atmos) +/area/station/engineering/atmos/project) "aLO" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red/fourcorners, @@ -4384,6 +4372,13 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/structure/table/reinforced, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/grenade/chem_grenade/smart_metal_foam, /turf/open/floor/iron, /area/station/engineering/atmos) "aYF" = ( @@ -4469,7 +4464,6 @@ /turf/open/floor/iron, /area/station/maintenance/department/science) "aZF" = ( -/obj/machinery/duct, /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 }, @@ -5922,17 +5916,17 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "bsc" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/item/stack/sheet/rglass{ - amount = 20; - pixel_x = 2; - pixel_y = -2 +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, -/obj/item/stack/sheet/plasteel/twenty, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/tile/yellow, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - Project Room Aft"; + name = "atmospherics camera" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "bsd" = ( /obj/structure/sign/nanotrasen{ pixel_x = -32 @@ -7477,6 +7471,7 @@ /obj/effect/turf_decal/tile/yellow, /obj/machinery/status_display/evac/directional/north, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos/project) "bJs" = ( @@ -10979,13 +10974,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/main) -"czB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "czD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, @@ -11144,13 +11132,9 @@ /area/station/maintenance/port/aft) "cBC" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/atmos) @@ -11203,6 +11187,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "cCp" = ( @@ -11505,13 +11490,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/research) -"cFe" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "cFq" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -16141,6 +16119,13 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/glasses/meson/engine/tray, +/obj/item/clothing/glasses/meson/engine/tray, /turf/open/floor/iron, /area/station/engineering/atmos) "dOc" = ( @@ -16217,6 +16202,11 @@ /obj/machinery/firealarm/directional/south, /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Project Room Fore"; + dir = 5; + name = "atmospherics camera" + }, /turf/open/floor/iron, /area/station/engineering/atmos/project) "dOX" = ( @@ -17198,12 +17188,6 @@ /obj/structure/rack, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"eba" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "ebb" = ( /obj/structure/chair{ dir = 4 @@ -17578,7 +17562,6 @@ /turf/open/space/basic, /area/space/nearstation) "egd" = ( -/obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -18041,17 +18024,6 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron, /area/station/maintenance/department/crew_quarters/bar) -"emr" = ( -/obj/machinery/light/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics - Project Room Fore"; - dir = 5; - name = "atmospherics camera" - }, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/trimline/yellow/line, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "ems" = ( /obj/machinery/netpod, /obj/machinery/light/neon_lining{ @@ -22603,16 +22575,6 @@ }, /turf/open/space/basic, /area/space) -"foL" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas, -/obj/item/clothing/glasses/meson/engine/tray, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "foR" = ( /obj/effect/spawner/structure/window/hollow/directional, /turf/open/floor/plating, @@ -28219,17 +28181,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/cargo/storage) -"gEB" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port Mix to Port Ports" - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gEF" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -28574,13 +28525,6 @@ /obj/machinery/gibber, /turf/open/floor/iron/dark/textured, /area/station/service/kitchen/coldroom) -"gIM" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 8 - }, -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) "gIT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28774,9 +28718,6 @@ /area/station/maintenance/solars/port/fore) "gKW" = ( /obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -28829,10 +28770,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"gMl" = ( -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "gMt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31985,7 +31922,6 @@ /turf/open/floor/iron, /area/station/commons/locker) "hxj" = ( -/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -33357,13 +33293,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/cargo/office) -"hPJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hPN" = ( /obj/effect/turf_decal/trimline/hot_pink/filled/line, /obj/effect/turf_decal/trimline/hot_pink/line{ @@ -33421,7 +33350,6 @@ /turf/open/floor/iron/white, /area/station/medical/pathology) "hQu" = ( -/obj/machinery/duct, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/iron, @@ -33595,14 +33523,6 @@ }, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/blueshield) -"hSx" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hSE" = ( /obj/structure/chair/stool/bar/directional/north, /obj/effect/decal/cleanable/dirt, @@ -37573,11 +37493,9 @@ /area/station/commons/dorms) "iOj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/meter, /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple, /turf/open/floor/iron, /area/station/engineering/atmos) "iOu" = ( @@ -38489,10 +38407,8 @@ /turf/open/floor/iron, /area/station/hallway/secondary/command) "jaX" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, /obj/machinery/status_display/evac/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) "jaZ" = ( @@ -39100,10 +39016,6 @@ /area/station/hallway/primary/port) "jhl" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port Mix to Starboard Ports" - }, /obj/effect/turf_decal/box/corners{ dir = 4 }, @@ -39664,12 +39576,8 @@ /turf/open/floor/iron, /area/station/engineering/main) "jnH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, -/obj/machinery/meter, /obj/effect/turf_decal/box/corners{ dir = 4 }, @@ -41434,13 +41342,6 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"jIB" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/meter, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "jIH" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -43853,11 +43754,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/evidence) -"kiQ" = ( -/obj/structure/closet/radiation, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "kiZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -44055,14 +43951,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"klb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "klc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -44620,7 +44508,6 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "ksH" = ( -/obj/machinery/duct, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 @@ -45946,10 +45833,9 @@ /turf/open/floor/carpet/blue, /area/station/service/library/lounge) "kKf" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/radiation, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/hfr_room) "kKg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/east, @@ -47656,12 +47542,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/security/office) -"leU" = ( -/obj/machinery/duct, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "lfn" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -49485,7 +49365,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) "lCg" = ( -/obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -51268,10 +51147,6 @@ "lVG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 - }, -/obj/machinery/meter, /obj/effect/turf_decal/box/corners, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -53867,16 +53742,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/library/printer) -"mEx" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/flashlight, -/obj/item/flashlight, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mEB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -54012,9 +53877,6 @@ "mGm" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "mGo" = ( @@ -55776,9 +55638,6 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "nbv" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -55993,10 +55852,16 @@ /turf/open/floor/iron, /area/station/science/research) "nfn" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/closet/radiation, /turf/open/floor/iron, -/area/station/engineering/atmos) +/area/station/engineering/atmos/project) "nfq" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -57837,8 +57702,6 @@ /turf/open/floor/iron/dark, /area/station/science/breakroom) "nDd" = ( -/obj/machinery/duct, -/obj/machinery/light/directional/west, /obj/effect/turf_decal/trimline/yellow/line{ dir = 8 }, @@ -59221,12 +59084,6 @@ /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron, /area/station/maintenance/department/science) -"nUc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "nUe" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, @@ -62773,13 +62630,6 @@ /obj/effect/turf_decal/siding/blue, /turf/open/floor/iron/white, /area/station/medical/storage) -"oNI" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "oOh" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -64725,7 +64575,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, /turf/open/floor/iron, @@ -65201,11 +65051,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"psR" = ( -/obj/machinery/atmospherics/components/binary/valve, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "psU" = ( /obj/machinery/growing/soil, /obj/machinery/camera/autoname/directional/west, @@ -65512,10 +65357,6 @@ /area/station/maintenance/starboard/aft) "pwO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/item/storage/box/lights/mixed, -/obj/item/grenade/chem_grenade/smart_metal_foam, -/obj/item/grenade/chem_grenade/smart_metal_foam, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/atmos) @@ -66087,11 +65928,17 @@ "pDE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, /obj/structure/sign/poster/official/wtf_is_co2/directional/north, +/obj/structure/table/reinforced, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/open/floor/iron, /area/station/engineering/atmos) "pDM" = ( @@ -72304,14 +72151,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/iron, /area/station/medical/morgue) -"raz" = ( -/obj/machinery/shower/directional/south{ - name = "emergency shower" - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/trimline/blue/end, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos/project) "raI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -75280,6 +75119,15 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/rglass{ + amount = 20; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/sheet/plasteel/twenty, /turf/open/floor/iron, /area/station/engineering/atmos) "rMt" = ( @@ -75708,7 +75556,6 @@ /turf/open/floor/iron/dark, /area/station/security/execution/education) "rQw" = ( -/obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/yellow/line{ dir = 4 }, @@ -75999,7 +75846,6 @@ /turf/open/floor/iron, /area/station/security/office) "rTH" = ( -/obj/machinery/duct, /obj/effect/turf_decal/trimline/yellow/corner{ dir = 8 }, @@ -78513,6 +78359,7 @@ /obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/meson/engine/tray, /obj/machinery/light/directional/east, +/obj/item/wrench, /turf/open/floor/iron, /area/station/engineering/atmos) "szG" = ( @@ -82022,7 +81869,13 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral, -/obj/item/kirbyplants/random, +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/t_scanner, +/obj/item/t_scanner, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "tsx" = ( @@ -82518,16 +82371,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"tyj" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table/reinforced, -/obj/item/t_scanner, -/obj/item/pipe_dispenser, -/obj/effect/turf_decal/bot, -/obj/item/pipe_dispenser, -/obj/item/storage/belt/utility, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "tym" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -82577,13 +82420,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"tyY" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos/hfr_room) "tzm" = ( /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) @@ -86938,7 +86774,6 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "uzJ" = ( -/obj/machinery/duct, /obj/effect/turf_decal/trimline/yellow/corner{ dir = 1 }, @@ -87067,11 +86902,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "uBf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/box/corners{ dir = 8 @@ -89105,13 +88936,6 @@ }, /area/station/commons/fitness/recreation) "vbp" = ( -/obj/machinery/duct, -/obj/machinery/light/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - Project Room Aft"; - name = "atmospherics camera" - }, -/obj/machinery/status_display/ai/directional/north, /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 }, @@ -89658,11 +89482,7 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "viX" = ( -/obj/item/wrench, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 1 - }, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -91771,14 +91591,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/textured, /area/station/engineering/atmos) -"vHo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vHu" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -92830,9 +92642,6 @@ /area/station/security/prison/workout) "vXF" = ( /obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -93596,9 +93405,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, -/obj/structure/table/reinforced, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass/fifty, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/atmos) @@ -94093,6 +93899,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "wlH" = ( @@ -95680,7 +95489,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "wBn" = ( -/obj/machinery/duct, /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/iron, /area/station/engineering/atmos/project) @@ -100190,16 +99998,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/eva/abandoned) -"xGL" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/shower/directional/north{ - name = "emergency shower" - }, -/obj/effect/turf_decal/trimline/blue/end{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos/project) "xGN" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -102553,6 +102351,7 @@ }, /obj/item/radio/intercom/directional/south, /obj/machinery/light/directional/south, +/obj/structure/closet/radiation, /turf/open/floor/iron, /area/station/engineering/atmos/project) "ylT" = ( @@ -125818,12 +125617,12 @@ eso kSt nWL iOj -aLN -klb +sID +pUW uBf -gEB -nfn -nfn +iOj +sID +sID phJ pPv mGH @@ -126074,13 +125873,13 @@ tlA qSm quR inv -hSx +nmP sID urV pUW nMT sID -jIB +nmP gqH chn chn @@ -126321,8 +126120,8 @@ uGJ jti jti uGJ -uGJ -uGJ +mtn +nfn cUF uAA sID @@ -126332,12 +126131,12 @@ xpY wCB saE jnH -hPJ +sID viX lVG jhl -nfn -nfn +sID +sID tAM eVy fyP @@ -126596,7 +126395,7 @@ thn ilH nQg kMh -mEx +pwO pwO bSx mfE @@ -126827,7 +126626,7 @@ ecH rVx xHw dYj -vSE +bsc rGb yhw fWN @@ -126851,10 +126650,10 @@ hUV wIf cwY cwY -vHo +fQm rYj -bsc -tyj +pwO +pwO wWy pDW dCH @@ -127345,8 +127144,8 @@ vZX umm yhw mYo -cUF -kKf +rGb +rGb kAX yhw rGb @@ -127602,9 +127401,9 @@ tTf umm doR mYo -cUF -raz -cFe +rGb +rGb +kAX doR rGb jti @@ -127624,7 +127423,7 @@ jJw dsS qnr kMh -foL +pwO cBC axg khM @@ -127858,9 +127657,9 @@ epV cIn rGb doR -emr -cUF -cUF +mYo +rGb +rGb vbp doR umm @@ -127881,7 +127680,7 @@ npE wIf gqd qPg -anp +pwO wfI sFf vgm @@ -128116,8 +127915,8 @@ cIn rGb yhw hQu -xGL -cUF +rGb +rGb ksH yhw rGb @@ -128373,9 +128172,9 @@ cIn umm fWN wBn -kiQ -cUF -oNI +rGb +rGb +vbp yhw umm fPf @@ -128889,7 +128688,7 @@ fWN yhw fWN yhw -leU +fWN yhw umm nVf @@ -129140,14 +128939,14 @@ nbv plK nJl dYj -cIn +aLN vev rGb umm umm rGb -gMl -gMl +rGb +rGb egd lCg aBX @@ -129389,14 +129188,14 @@ qYo aaa dYj dYj -eba -czB -aul -psR -nUc +hJz +kVL +kVL +kVL +hJz jaX -dYj -dYj +kKf +kKf bJg auP eQi @@ -129646,8 +129445,8 @@ efQ aaa qYo dYj -tyY -tyY +uUg +uUg uUg dYj dYj @@ -129903,8 +129702,8 @@ efQ aaa qYo aaa -gIM -gIM +vVc +vVc vVc vVc rmh diff --git a/_maps/map_files/Graveyard/Graveyard.dmm b/_maps/map_files/Graveyard/Graveyard.dmm index 6e53774608f8b..99dfde2ea3760 100644 --- a/_maps/map_files/Graveyard/Graveyard.dmm +++ b/_maps/map_files/Graveyard/Graveyard.dmm @@ -2651,6 +2651,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/station/engineering/atmos/office) "aYC" = ( @@ -5306,12 +5307,6 @@ dir = 1 }, /area/station/ai_monitored/security/armory) -"bZa" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bZd" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/siding/dark{ @@ -8341,9 +8336,6 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, @@ -9285,9 +9277,6 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "dzP" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /turf/open/floor/iron, /area/station/engineering/atmos/office) "dAh" = ( @@ -13811,19 +13800,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/chapel/funeral) -"frQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 1 - }, -/obj/machinery/meter, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/office) "fsb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18590,18 +18566,6 @@ /obj/effect/turf_decal/tile/dark_red/fourcorners, /turf/open/floor/iron/dark/textured, /area/station/security/warden) -"hjx" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/office) "hjy" = ( /obj/effect/spawner/random/trash/grime, /turf/open/misc/asteroid, @@ -19295,16 +19259,12 @@ /turf/open/misc/grass/jungle, /area/graveyard/surface/structures/departurepark) "hwM" = ( -/obj/machinery/meter, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 1 - }, /turf/open/floor/iron, /area/station/engineering/atmos/office) "hwR" = ( @@ -20500,13 +20460,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"hTy" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 10 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hTL" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -30493,9 +30446,6 @@ /obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /turf/open/floor/iron, /area/station/engineering/atmos/office) "lQX" = ( @@ -31884,12 +31834,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"moW" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/office) "mpf" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -32815,9 +32759,9 @@ /turf/open/misc/dirt/jungle, /area/graveyard/surface/structures/church) "mGX" = ( -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/components/unary/bluespace_sender, /turf/open/floor/iron, /area/station/engineering/atmos/office) "mHa" = ( @@ -45654,9 +45598,6 @@ /turf/open/floor/carpet/royalblue, /area/graveyard/bunker/strange) "rLR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 10 - }, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, @@ -48248,8 +48189,8 @@ /turf/open/floor/iron, /area/station/security/brig) "sOO" = ( -/obj/machinery/atmospherics/components/unary/bluespace_sender, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/office) "sPf" = ( @@ -49469,12 +49410,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/engine, /area/station/science/xenobiology) -"tmj" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "tmk" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -49830,12 +49765,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"ttI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/office) "ttX" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/orange/anticorner/contrasted{ @@ -51055,10 +50984,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "tQC" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to North Ports"; - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -60450,9 +60375,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "xwS" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Port to Filter" +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 4 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -61831,10 +61755,6 @@ "xXE" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/freezerchamber) -"xXN" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/office) "xXS" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -145295,9 +145215,9 @@ eYZ jWS nuI niF -bnZ -cyM -cyM +tQl +tQl +tQl nxd cMk fLH @@ -145809,7 +145729,7 @@ niX jWS qRB tQl -crG +tQl bMf ssM lrz @@ -146066,11 +145986,11 @@ fuu jWS for uRn +tQl +tQl +xwS lrz -bZa -crG -lrz -bZa +tQl aAY pTK qhQ @@ -146323,11 +146243,11 @@ dys jWS atD sRk -tmj -bZa -crG +tQl +tQl +tQl lrz -bZa +tQl aAY mPs qhQ @@ -146580,11 +146500,11 @@ rnB jWS qHY sse +tQl +tQl +tQl lrz -bZa -crG -lrz -bZa +tQl aAY jYy uSB @@ -146837,9 +146757,9 @@ tSw iRQ jOC wbq -hTy -kJG -crG +wbq +tQl +tQl crG tQl aAY @@ -147095,8 +147015,8 @@ jWS aNr tQl wbq -xwS -crG +tQl +tQl lrz aZW nAq @@ -149915,8 +149835,8 @@ bPT exl oTb hwM -xXN -ttI +dzP +dzP aNa pID cdR @@ -150428,8 +150348,8 @@ exl qYO exl oTb -frQ -moW +hwM +dzP dzP aps epx @@ -150686,7 +150606,7 @@ exl exl oTb rLR -hjx +lQT lQT sCa dmU diff --git a/_maps/map_files/Heliostation/Heliostation.dmm b/_maps/map_files/Heliostation/Heliostation.dmm index 63b9fafdabb45..165d4a0fe1ebe 100644 --- a/_maps/map_files/Heliostation/Heliostation.dmm +++ b/_maps/map_files/Heliostation/Heliostation.dmm @@ -4466,12 +4466,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"aAO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "aAP" = ( /obj/machinery/light/red/dim/directional/north, /obj/effect/decal/cleanable/dirt, @@ -8058,13 +8052,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/wood, /area/station/service/lawoffice) -"aQF" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/trinary/filter/flipped{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "aQJ" = ( /obj/machinery/computer/holodeck{ dir = 4 @@ -32589,14 +32576,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/solars/starboard/aft) -"fvH" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Port to Filter" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "fvI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34661,10 +34640,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"gmt" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gmN" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -36881,14 +36856,6 @@ }, /turf/open/floor/iron, /area/station/science/lab) -"hfE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/meter, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "hfI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37892,14 +37859,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/checkpoint) -"hxz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/meter, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "hxC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/south, @@ -39209,12 +39168,6 @@ /obj/machinery/light/dim/directional/south, /turf/open/floor/iron, /area/station/security/courtroom) -"hVb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hVT" = ( /obj/machinery/light/directional/east, /obj/structure/chair/sofa/bench/right{ @@ -40440,18 +40393,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/station/command/teleporter) -"isT" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Mix to Ports" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/engineering/atmos) "itl" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 1 @@ -44025,13 +43966,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/solars/port/aft) -"jIW" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Pure to Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "jIZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -46071,10 +46005,6 @@ /area/station/maintenance/department/science/xenobiology) "kvX" = ( /obj/effect/turf_decal/bot_white, -/obj/item/stack/cable_coil/five, -/obj/structure/frame/machine{ - anchored = 1 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "kwb" = ( @@ -47845,13 +47775,6 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"ljo" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to North Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ljq" = ( /obj/structure/chair{ dir = 8 @@ -48210,9 +48133,9 @@ /area/station/engineering/atmos) "lqs" = ( /obj/effect/turf_decal/bot, -/obj/structure/tank_dispenser, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/item/radio/intercom/directional/west, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "lqu" = ( @@ -48837,6 +48760,7 @@ /area/station/hallway/secondary/service) "lCN" = ( /obj/machinery/firealarm/directional/north, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron, /area/station/engineering/atmos) "lDa" = ( @@ -49815,13 +49739,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"lWk" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Filter" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "lWq" = ( /obj/structure/window/spawner/directional/north, /obj/structure/table/glass, @@ -51995,11 +51912,11 @@ /turf/open/floor/iron, /area/station/maintenance/port) "mLR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/meter, -/turf/open/floor/iron, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/dark, /area/station/engineering/atmos) "mLT" = ( /obj/structure/disposalpipe/segment, @@ -54183,12 +54100,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/storage/primary) -"nCM" = ( -/obj/structure/frame/machine{ - anchored = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "nCT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59760,18 +59671,9 @@ /turf/open/floor/iron/white, /area/station/medical/chemistry) "pDQ" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/bot, -/obj/item/clothing/gloves/color/black{ - pixel_y = -1 - }, -/obj/item/clothing/gloves/color/black{ - pixel_y = 3 - }, -/obj/item/clothing/gloves/color/black{ - pixel_y = 7 - }, /obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/tank_dispenser, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "pDV" = ( @@ -60390,13 +60292,6 @@ /obj/machinery/light/dim/directional/west, /turf/open/floor/iron, /area/station/security/prison) -"pQu" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "pQx" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -65903,9 +65798,6 @@ /turf/open/floor/plating, /area/station/engineering/atmos/storage/gas) "rVM" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -66092,11 +65984,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"scf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "scg" = ( /obj/effect/spawner/random/structure/steam_vent, /obj/structure/cable, @@ -67567,13 +67454,6 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) -"sGv" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to South Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "sGz" = ( /obj/structure/table/reinforced/rglass, /obj/machinery/computer/records/medical/laptop{ @@ -68139,13 +68019,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"sRi" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "sRz" = ( /obj/structure/table, /obj/item/storage/fancy/candle_box{ @@ -72806,9 +72679,8 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "uEo" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron, /area/station/engineering/atmos) "uEv" = ( /obj/machinery/computer/bank_machine{ @@ -73286,14 +73158,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"uOJ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ - dir = 8 - }, -/obj/machinery/meter, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "uOY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -73851,10 +73715,6 @@ /turf/open/floor/iron/dark/textured, /area/station/security/prison/safe) "vaf" = ( -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -74273,6 +74133,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/frame/machine{ + anchored = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "vjN" = ( @@ -78772,13 +78635,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"wUi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "wUo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79939,6 +79795,10 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/frame/machine{ + anchored = 1 + }, +/obj/item/stack/cable_coil/five, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "xsZ" = ( @@ -80279,11 +80139,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8; - name = "Exfiltrate Port" - }, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -81780,13 +81635,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/maintenance/port) -"yeb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/brown/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "yeh" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -102705,15 +102553,15 @@ xgb syn vTj roc -uEo -wUi -ljo -wUi -yeb -yeb -yeb -uEo -hfE +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ mCv gYx mjd @@ -102963,14 +102811,14 @@ pge xPa uFJ wZf -pQu uFJ -sRi +uFJ +uFJ uFJ wZf uFJ uFJ -fvH +uFJ uFJ bmG jul @@ -103218,16 +103066,16 @@ coW xUt off vWP -jIW -wUi -scf -sGv -yeb -uOJ -aQF -uOJ -lWk -hxz +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ +uFJ gwe qoP evW @@ -103476,7 +103324,7 @@ pvj qDd eSD uPO -isT +uPO agI uPO uPO @@ -103733,7 +103581,7 @@ nIW mbq cAe crj -mLR +crj tbh crj crj @@ -103990,7 +103838,7 @@ ozs rKd oGj crj -aAO +crj cyL crj dyf @@ -104247,7 +104095,7 @@ ngB off aZY crj -aAO +crj uGc fCA crj @@ -104504,11 +104352,11 @@ ujv tti uma crj -aAO +crj uGc crj crj -nCM +crj htR crj crj @@ -105017,8 +104865,8 @@ gNr qwz oHA kjx -gmt -hVb +crj +crj omW crj pDh @@ -106049,11 +105897,11 @@ oNV vjF xsY qDQ -mBv +mLR mBv cDw mBv -mBv +mLR kyu cwt kMP @@ -106310,7 +106158,7 @@ lCN nCu vpk lAV -crj +uEo kyu cwt kMP diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 117d70046818d..2268a854b96d2 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -3243,14 +3243,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"bbs" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 8 - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "bbv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -4192,12 +4184,6 @@ "bol" = ( /turf/open/floor/iron/dark/textured, /area/station/security/prison) -"bos" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "bov" = ( /obj/structure/stairs/south, /turf/open/floor/stone, @@ -4891,10 +4877,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/icemoon, /area/station/science/ordnance/bomb) -"byH" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "byK" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5236,7 +5218,11 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ +/obj/machinery/atmospherics/components/binary/pump/on/violet/visible/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Fuel Pipe to Incinerator"; dir = 4 }, /turf/open/floor/iron, @@ -5665,12 +5651,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) -"bIs" = ( -/obj/structure/chair/stool/directional/east, -/turf/open/floor/iron/half{ - dir = 1 - }, -/area/station/engineering/atmos) "bIt" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -5700,6 +5680,7 @@ "bIU" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, +/obj/item/wrench, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "bIV" = ( @@ -6121,9 +6102,6 @@ /area/station/science/xenobiology/cell) "bOY" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 10 - }, /obj/item/radio/intercom/directional/east, /obj/machinery/light/directional/east, /turf/open/floor/iron, @@ -7692,13 +7670,10 @@ /area/station/security/prison/workout) "cmJ" = ( /obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 6 - }, -/obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/structure/reagent_dispensers/plumbed, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "cmL" = ( @@ -8023,9 +7998,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "cqW" = ( @@ -12394,9 +12366,6 @@ /area/station/hallway/secondary/exit/departure_lounge) "dFC" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "dFD" = ( @@ -12531,13 +12500,6 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plastic, /area/station/maintenance/starboard/fore) -"dIl" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "dIx" = ( /obj/structure/trash_pile, /turf/open/floor/plating, @@ -15416,12 +15378,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "eDj" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/atmos) "eDq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -16543,10 +16503,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"eVI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "eVL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, @@ -16986,12 +16942,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"fcN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "fcP" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -17301,10 +17251,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"fiA" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "fiD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18137,13 +18083,6 @@ dir = 8 }, /area/station/security/prison) -"fwq" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port to Filter" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "fws" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/generic/style_random, @@ -18674,9 +18613,6 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "fFv" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to West Ports" - }, /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/light/directional/west, /turf/open/floor/iron, @@ -20107,11 +20043,6 @@ /obj/structure/sign/warning/fire/directional/south, /turf/open/openspace/icemoon/keep_below, /area/icemoon/underground/explored) -"gdv" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gdx" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20611,12 +20542,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/service/kitchen/coldroom) -"gmJ" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Infiltrate/Filter" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gmL" = ( /obj/structure/table, /obj/item/stock_parts/subspace/transmitter, @@ -21059,12 +20984,6 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/openspace, /area/station/service/kitchen/coldroom) -"gtg" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "gti" = ( /turf/open/openspace, /area/station/maintenance/starboard/aft) @@ -21274,8 +21193,8 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "gxP" = ( -/obj/structure/reagent_dispensers/plumbed, /obj/effect/turf_decal/bot_white, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/large, /area/station/engineering/atmos) "gxR" = ( @@ -21591,13 +21510,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/textured_large, /area/station/engineering/storage) -"gBx" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gBI" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating, @@ -21991,9 +21903,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "gHm" = ( @@ -24417,16 +24326,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"huZ" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 10 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "hvl" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/effect/turf_decal/siding/wood{ @@ -25558,15 +25457,6 @@ }, /turf/open/floor/plating, /area/station/security/brig) -"hQu" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hQF" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/flasher/directional/west{ @@ -26599,12 +26489,6 @@ /obj/machinery/portable_atmospherics/pipe_scrubber, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"igx" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "igB" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/glass, @@ -29616,10 +29500,10 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "jaN" = ( -/obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/structure/reagent_dispensers/plumbed, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "jaO" = ( @@ -29793,12 +29677,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone, /area/station/smithing) -"jdA" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 10 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "jdB" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -31469,9 +31347,6 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "jIg" = ( @@ -32025,13 +31900,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"jPo" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "jPs" = ( /obj/effect/spawner/random/engineering/canister, /obj/structure/railing{ @@ -33239,13 +33107,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"khf" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kho" = ( /obj/item/radio/intercom/directional/south, /obj/structure/table/wood, @@ -33553,9 +33414,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -33856,9 +33714,6 @@ dir = 1; name = "Air Outlet Pump" }, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 5 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -34254,14 +34109,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"kwm" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 4 - }, -/obj/item/wrench, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kwK" = ( /obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/half, @@ -37690,9 +37537,6 @@ }, /area/mine/eva) "lxU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 8 - }, /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -38646,13 +38490,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/dorms) -"lOI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 5 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "lOM" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -40659,12 +40496,6 @@ }, /turf/open/floor/iron, /area/station/science/ordnance) -"mxj" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to East Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "mxD" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -41593,15 +41424,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"mNF" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "mNJ" = ( /obj/structure/cable, /obj/machinery/holopad/secure, @@ -42592,12 +42414,6 @@ }, /turf/open/floor/iron, /area/station/command/bridge) -"ncl" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "ncp" = ( /obj/machinery/camera/directional/south{ c_tag = "Arrivals Bay 3 & 4" @@ -43480,13 +43296,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/engineering/lobby) -"noY" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "npa" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -43565,10 +43374,6 @@ /obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/dark, /area/mine/laborcamp) -"npJ" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "npL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44395,11 +44200,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"nBG" = ( -/obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "nBH" = ( /obj/structure/barricade/sandbags, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -45617,6 +45417,7 @@ /area/station/science/research) "nSc" = ( /obj/effect/turf_decal/siding/yellow, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron, /area/station/engineering/atmos) "nSk" = ( @@ -47821,9 +47622,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "oAp" = ( @@ -48983,9 +48781,6 @@ /area/icemoon/underground/unexplored/rivers/deep) "oSX" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "oTa" = ( @@ -50088,13 +49883,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"pkY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "plg" = ( /obj/machinery/atmospherics/components/tank/air, /obj/effect/turf_decal/delivery, @@ -50641,8 +50429,8 @@ /turf/open/floor/wood, /area/station/service/library) "pus" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/atmos) "puN" = ( @@ -51426,12 +51214,6 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/iron/dark/textured, /area/station/security/range) -"pGf" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "pGo" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -53472,9 +53254,6 @@ /obj/machinery/atmospherics/components/trinary/mixer/airmix{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "qnU" = ( @@ -54315,6 +54094,9 @@ /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "qAV" = ( @@ -55026,12 +54808,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) -"qMM" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "qMN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -57212,12 +56988,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"rwC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rwD" = ( /obj/structure/rack, /obj/item/clothing/head/soft/mime, @@ -58142,9 +57912,6 @@ "rLs" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "rLu" = ( @@ -58376,9 +58143,6 @@ c_tag = "Atmospherics - South East"; dir = 6 }, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 1 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "rPL" = ( @@ -59004,12 +58768,6 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"rZE" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "rZG" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/medical/pathology) @@ -60207,9 +59965,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "ssq" = ( @@ -62205,11 +61960,6 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"sYZ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "sZa" = ( /obj/effect/turf_decal/box/white{ color = "#9FED58" @@ -62301,6 +62051,10 @@ "taN" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) "taV" = ( @@ -65084,12 +64838,6 @@ /obj/item/melee/roastingstick, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"tWI" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to Turbine" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "tWK" = ( /obj/structure/cable, /turf/open/floor/plating/snowed/icemoon, @@ -65426,10 +65174,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) -"ubF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "ubG" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -67352,12 +67096,6 @@ "uGr" = ( /turf/open/openspace, /area/station/security/brig/upper) -"uGy" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uGz" = ( /obj/machinery/modular_computer/preset/id{ dir = 4 @@ -69714,13 +69452,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/maintenance/aft/greater) -"vtv" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port to Infiltrate/Filter" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vtz" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -69758,11 +69489,6 @@ /obj/structure/fireaxecabinet/mechremoval/directional/north, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"vuu" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/dark, -/turf/open/floor/plating, -/area/station/engineering/atmos) "vux" = ( /obj/structure/bed, /obj/effect/decal/cleanable/dirt, @@ -72061,9 +71787,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "wgI" = ( @@ -73128,12 +72851,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/security/prison) -"wwu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wwB" = ( /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73333,13 +73050,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/server) -"wAB" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wAQ" = ( /obj/machinery/computer/shuttle/labor/one_way{ dir = 4 @@ -74957,9 +74667,6 @@ /obj/machinery/camera/directional/west{ c_tag = "Atmospherics - Central" }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Infiltrate" - }, /turf/open/floor/iron, /area/station/engineering/atmos) "wWJ" = ( @@ -76060,9 +75767,6 @@ "xmL" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/structure/sign/warning/no_smoking{ pixel_x = -28 }, @@ -76519,19 +76223,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) -"xvj" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xvn" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -76665,9 +76356,9 @@ /area/station/medical/medbay/lobby) "xxs" = ( /obj/effect/turf_decal/bot_white, -/obj/structure/reagent_dispensers/plumbed, /obj/effect/turf_decal/siding/yellow/corner, /obj/item/radio/intercom/directional/south, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/large, /area/station/engineering/atmos) "xxx" = ( @@ -77285,7 +76976,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1, /turf/open/floor/iron, /area/station/engineering/atmos) "xGJ" = ( @@ -182912,9 +182602,9 @@ ljL ljL wHg lub -dIl azB -bbs +azB +azB bWK bWK xJw @@ -183169,9 +182859,9 @@ ljL ljL wHg lub -pkY -fiA -ncl +bWK +bWK +bWK bWK bWK lub @@ -183683,9 +183373,9 @@ ndH qWK oDn aiJ -jPo -byH -bos +bWK +bWK +bWK bWK bWK neu @@ -183940,9 +183630,9 @@ nmL rIF uBA rFI -rZE bWK -rZE +bWK +bWK bWK bWK lub @@ -184197,9 +183887,9 @@ nmL qpr wHg aiJ -eDj rEx -eDj +rEx +rEx bWK bWK lub @@ -242534,7 +242224,7 @@ rXe hHN bJD ydN -rsW +eDj tQb xKd fJL @@ -242785,7 +242475,7 @@ rPd uop caS hHN -wAB +hHN jkW laV hHN @@ -243042,7 +242732,7 @@ cEw cEw cEw jaN -fwq +hHN hHN lRR bpR @@ -243299,7 +242989,7 @@ rLs xmL cEw cmJ -rwC +hHN tyb nrA flH @@ -243549,17 +243239,17 @@ vBv kjy grI ruI -ubF +hHN fFv -wwu -kwm -wwu +hHN +hHN +hHN wWt -eVI -gmJ -npJ +hHN +hHN +hHN xGI -mNF +jlV baQ cYC rsW @@ -243806,17 +243496,17 @@ jco sTe jvS iSl -gdv +hHN yiv tbh -bIs +tbh tbh yiv -vtv +hHN hHN hHN nrA -hQu +jlV eBT snW hpI @@ -244063,15 +243753,15 @@ nSD uID vBC goE -ubF -mxj -fcN +hHN +hHN +hHN lxU -fcN -fcN -nBG -tWI -qMM +hHN +hHN +hHN +hHN +hHN rBQ ssh skx @@ -244320,15 +244010,15 @@ uht ehR gnw hHN -pGf -igx +hHN +hHN dFC dFC jBR fnA hHN lRR -khf +bpR shj qnO lxu @@ -244578,14 +244268,14 @@ hIA rBQ fQc fQc -noY +bpR ruw fQc fQc fQc mvG shj -uGy +hHN hHN cqO cfC @@ -244844,7 +244534,7 @@ oyX xfB jHQ xfB -gBx +xfB rkm sEX hpI @@ -245613,9 +245303,9 @@ rwB swu mkG swu -huZ -sYZ -lOI +rwB +swu +swu pGQ wgG uQy @@ -245872,7 +245562,7 @@ jgn bea xDG qwF -gtg +sEB cEw bCT kfs @@ -246129,7 +245819,7 @@ xeM vtj rQN qwF -gtg +sEB hpI qAT kfs @@ -246386,9 +246076,9 @@ aOX aRj aOX qwF -jdA -vuu -xvj +sEB +hpI +jap rCW lfF fJe diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5b6d593c4255d..ac971cb12ee99 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -2151,7 +2151,6 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/station/service/chapel/dock) "aGM" = ( -/obj/structure/chair/stool/directional/south, /obj/effect/landmark/start/atmospheric_technician, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -4009,13 +4008,12 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/item/kirbyplants{ - icon_state = "plant-03" - }, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/closet/radiation, +/obj/item/clothing/glasses/meson, /turf/open/floor/iron, /area/station/engineering/atmos) "bon" = ( @@ -4729,6 +4727,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "bAf" = ( @@ -6335,7 +6334,10 @@ /area/station/medical/treatment_center) "bYo" = ( /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/components/trinary/mixer/flipped, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 8 + }, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "bYK" = ( @@ -6742,14 +6744,6 @@ "cdZ" = ( /turf/closed/wall/rust, /area/station/ai_monitored/turret_protected/ai) -"cec" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "East Ports to West Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "ceg" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -7202,14 +7196,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/office) -"cjv" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "cjx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8419,10 +8405,6 @@ /turf/closed/wall/r_wall, /area/station/engineering/atmos) "cCJ" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port Mix to East Ports" - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -9381,14 +9363,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) -"cUM" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "cUN" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/medical/central) @@ -9480,20 +9454,6 @@ /mob/living/basic/migo, /turf/open/misc/asteroid/airless, /area/space/nearstation) -"cWb" = ( -/obj/structure/table, -/obj/item/radio{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/radio{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "cWi" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -10110,8 +10070,6 @@ /area/station/hallway/primary/fore) "dgg" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/pipedispenser/disposal, -/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "dgj" = ( @@ -12975,8 +12933,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/pathology) "ebp" = ( -/obj/structure/table, -/obj/item/pipe_dispenser, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "eby" = ( @@ -13790,18 +13746,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/medical/treatment_center) -"enr" = ( -/obj/structure/table, -/obj/item/storage/box/lights/mixed{ - pixel_y = 5 - }, -/obj/item/analyzer{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/analyzer, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "enG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -20032,11 +19976,6 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"gkX" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) "glv" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/mineral/random/labormineral, @@ -20568,17 +20507,9 @@ /obj/structure/grille, /turf/closed/wall/r_wall/rust, /area/station/engineering/atmos) -"gvh" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gvu" = ( /obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box, -/obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "gvK" = ( @@ -20789,6 +20720,7 @@ /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/digital_clock/directional/north, +/obj/item/pipe_dispenser, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "gyW" = ( @@ -27572,12 +27504,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"iwT" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ixb" = ( /obj/machinery/requests_console/directional/north{ department = "Xenobiology"; @@ -28042,11 +27968,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "iCq" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "iCw" = ( @@ -28735,14 +28661,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/starboard) -"iLQ" = ( -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "iLX" = ( /obj/structure/table, /obj/machinery/computer/security/telescreen{ @@ -31438,7 +31356,6 @@ /turf/open/floor/engine, /area/station/engineering/gravity_generator) "jEh" = ( -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Port to Filter" @@ -32947,15 +32864,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"kbZ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kcg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34798,10 +34706,6 @@ /obj/machinery/smartfridge/chemistry/preloaded, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) -"kHQ" = ( -/obj/structure/sign/poster/official/wtf_is_co2, -/turf/closed/wall, -/area/station/engineering/atmos) "kHR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35085,8 +34989,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "kMY" = ( -/obj/machinery/light/directional/east, -/obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35919,10 +35821,6 @@ /turf/open/floor/iron/dark, /area/station/service/lawoffice) "laL" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - initialize_directions = 8 - }, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -36489,14 +36387,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft) -"llR" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port Mix to West Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "llZ" = ( /obj/effect/turf_decal/bot, /obj/machinery/digital_clock/directional/north, @@ -36554,13 +36444,6 @@ "lmO" = ( /turf/closed/wall/rust, /area/station/cargo/storage) -"lng" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) "lnr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -37703,15 +37586,6 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) -"lFe" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lFr" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -38253,12 +38127,6 @@ /obj/effect/decal/remains/human, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) -"lMI" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) "lNe" = ( /obj/docking_port/stationary/mining_home/common/kilo, /turf/open/floor/plating, @@ -41204,6 +41072,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "mJR" = ( @@ -42688,6 +42557,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/engineering/atmos) "niB" = ( @@ -43281,8 +43151,15 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "nsX" = ( -/obj/structure/plaque/static_plaque/atmos, -/turf/closed/wall, +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, /area/station/engineering/atmos) "nsZ" = ( /obj/structure/cable, @@ -44383,7 +44260,6 @@ "nKQ" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "nLa" = ( @@ -44932,15 +44808,21 @@ }, /obj/machinery/light_switch/directional/north, /obj/machinery/light/directional/north, -/obj/item/kirbyplants{ - icon_state = "plant-05" - }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 10 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/table, +/obj/item/storage/box/lights/mixed{ + pixel_y = 5 + }, +/obj/item/analyzer{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/analyzer, /turf/open/floor/iron, /area/station/engineering/atmos) "nTG" = ( @@ -46763,13 +46645,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/maintenance/starboard) -"oBN" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "oBP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47175,11 +47050,11 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "oJr" = ( -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /obj/effect/turf_decal/delivery, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "oJU" = ( @@ -48668,7 +48543,6 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) "piD" = ( -/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -49627,6 +49501,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos) "pwo" = ( @@ -54020,10 +53895,6 @@ /area/station/medical/office) "qRy" = ( /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "qRD" = ( @@ -54085,7 +53956,6 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "qSe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -55180,12 +55050,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/research) -"riI" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/folder/yellow, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "riQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57491,7 +57355,6 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "rUN" = ( -/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -59315,9 +59178,6 @@ /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "szp" = ( -/obj/machinery/shower/directional/east{ - name = "emergency shower" - }, /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/box/corners{ dir = 4 @@ -59661,15 +59521,15 @@ dir = 4 }, /obj/structure/noticeboard/directional/north, -/obj/item/kirbyplants{ - icon_state = "plant-05" - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/closet/radiation, +/obj/item/clothing/glasses/meson, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos) "sFr" = ( @@ -61152,6 +61012,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/engineering/atmos) "tcY" = ( @@ -62899,20 +62760,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/security/prison) -"tHN" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/shower/directional/east{ - name = "emergency shower" - }, -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "tHT" = ( /obj/machinery/door/airlock/grunge{ name = "Cell 3" @@ -63601,11 +63448,6 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) -"tTG" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "tUc" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ @@ -64316,6 +64158,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/engineering/atmos) "ufL" = ( @@ -64728,6 +64571,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "unv" = ( @@ -66490,6 +66334,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos) "uPk" = ( @@ -68119,11 +67964,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/art) -"vqv" = ( -/obj/item/wrench, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vqw" = ( /turf/closed/wall/r_wall, /area/station/tcommsat/computer) @@ -70034,10 +69874,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/medical/cryo) -"vRK" = ( -/obj/structure/sign/warning/no_smoking, -/turf/closed/wall, -/area/station/engineering/atmos) "vRO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -71052,6 +70888,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/item/wrench, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "wgt" = ( @@ -73130,6 +72967,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "wNf" = ( @@ -73566,13 +73404,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/cargo/warehouse) -"wTz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wTP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74383,7 +74214,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "xfN" = ( @@ -77728,6 +77558,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/pipedispenser/disposal, /turf/open/floor/iron, /area/station/engineering/atmos) "ykE" = ( @@ -77790,12 +77621,6 @@ /obj/machinery/composters, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) -"ylD" = ( -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ylI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -103008,7 +102833,7 @@ bAn mum laL mum -lMI +mum mum uai mum @@ -103262,11 +103087,11 @@ mLN mLN yhs mum -gkX +qRy qRy dho bYo -lng +qRy rPW mum dxn @@ -106077,7 +105902,7 @@ kMY piD lPJ aLP -tTG +jUz xfL hmD xcA @@ -106329,16 +106154,16 @@ cfL sSZ pwh yfr -kHQ -wRU -wRU +ebp +ebp +ebp jEh jUz -tTG +jUz jfL cQX fYm -pet +nsX uZZ okk ahf @@ -106586,11 +106411,11 @@ cfL okq fxT yfr -iwT -wRU -cWb -wTz -cec +dgg +ebp +ebp +jUz +jUz nKQ xzi uYw @@ -106843,13 +106668,13 @@ cfL dgu wxv doN -iwT -nsX -ylD -gvh -vqv -cjv -iLQ +dgg +ebp +gvu +jUz +jUz +qSe +gvu sKp pWY tzF @@ -107101,12 +106926,12 @@ gyM aCK hWd dgg -wRU +ebp gvu -oBN +jUz aGM -kbZ -iLQ +qSe +gvu lVf gzC nCK @@ -107358,12 +107183,12 @@ sFz svs hWd ebp -wRU -ylD -gvh +ebp +gvu +jUz rah -cjv -iLQ +qSe +gvu rov nPN pet @@ -107614,10 +107439,10 @@ cfL tbk tQG hWd -riI -vRK -enr -llR +ebp +ebp +ebp +jUz jUz cCJ fdd @@ -107871,11 +107696,11 @@ cfL wRU uOY hWd -wRU -wRU -wRU -lFe -cUM +ebp +ebp +ebp +jUz +jUz qSe xAW rHp @@ -108128,7 +107953,7 @@ sOV knv aQT gdh -tHN +szp rUN szp bKa diff --git a/_maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm b/_maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm index a791b61e77bf6..bdc3b35944fac 100644 --- a/_maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm +++ b/_maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm @@ -8384,9 +8384,9 @@ /turf/open/openspace, /area/station/maintenance/starboard/greater) "eiv" = ( -/obj/structure/tank_dispenser, /obj/structure/window/spawner/directional/east, /obj/structure/window/spawner/directional/south, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "eiy" = ( @@ -23497,9 +23497,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "lmR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 9 - }, /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -23510,7 +23507,11 @@ /turf/open/floor/iron/diagonal, /area/station/hallway/primary/central/aft) "lmX" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron, /area/station/engineering/atmos) "lmZ" = ( @@ -30654,13 +30655,6 @@ /obj/item/gun/energy/laser, /turf/open/floor/iron/diagonal, /area/station/security/warden) -"oIE" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron, -/area/station/engineering/atmos) "oIZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -31291,11 +31285,6 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron, /area/station/science/ordnance/storage) -"oYE" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "oYO" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -33560,11 +33549,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/diagonal, /area/station/security/brig/entrance) -"qeF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/turf/open/floor/iron, -/area/station/engineering/atmos) "qeN" = ( /obj/structure/railing/wooden_fencing{ dir = 8 @@ -35445,7 +35429,11 @@ /turf/open/floor/iron/diagonal, /area/station/commons/lounge) "rax" = ( -/obj/machinery/atmospherics/components/binary/pump, +/obj/structure/cable, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/structure/tank_dispenser, /turf/open/floor/iron, /area/station/engineering/atmos) "raZ" = ( @@ -49089,6 +49077,7 @@ dir = 4 }, /obj/structure/sign/poster/official/random/directional/east, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron, /area/station/engineering/atmos) "xvl" = ( @@ -129141,8 +129130,8 @@ nva nva nva nva -lmX -oYE +nva +qwY jIh nCT nva @@ -129654,9 +129643,9 @@ nva nva nva nva -lmX -rax -qeF +nva +nva +qwY jIh nCT nva @@ -129911,16 +129900,16 @@ nva nva nva nva -lmX -rax +nva +nva lmR jwf dBE nva vqe knR -oIE -oIE +nva +nva dhO dhO nva @@ -130681,7 +130670,7 @@ dZW hSi cnR hSi -dxI +lmX xve sKC ckm @@ -131208,7 +131197,7 @@ fbA dTm dTm qJk -rKh +rax nva nva qwY diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4c9d0a9f154e7..b93560af4729e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2686,7 +2686,7 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "aSB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, +/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "aSD" = ( @@ -5397,15 +5397,6 @@ /obj/machinery/slime_market_pad, /turf/open/floor/iron, /area/station/science/xenobiology) -"bQY" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "bRc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -7833,13 +7824,6 @@ dir = 4 }, /area/station/science/lab) -"cQQ" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "cRj" = ( /obj/machinery/vending/hydronutrients, /obj/machinery/light/directional/north, @@ -8777,9 +8761,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "dhw" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 10 - }, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, @@ -10016,12 +9997,6 @@ /obj/machinery/vending/wardrobe/xeno_wardrobe, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"dGq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/stairs/left{ - dir = 1 - }, -/area/station/engineering/atmos) "dGs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/showcase/machinery/oldpod{ @@ -10160,11 +10135,6 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, /area/station/commons/lounge) -"dJK" = ( -/turf/open/floor/iron/stairs/right{ - dir = 1 - }, -/area/station/engineering/atmos) "dJN" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -14496,13 +14466,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/storage) -"fiE" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port Mix to North Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "fiH" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -15417,12 +15380,6 @@ "fzG" = ( /turf/open/floor/iron/white, /area/station/science/circuits) -"fzM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "fAd" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -16636,10 +16593,6 @@ "fXj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "fXK" = ( @@ -17639,11 +17592,6 @@ /obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"gpQ" = ( -/turf/open/floor/iron/stairs/medium{ - dir = 1 - }, -/area/station/engineering/atmos) "gpS" = ( /obj/machinery/camera/directional/east{ c_tag = "Captain's Office" @@ -18807,12 +18755,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"gMt" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gMz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19091,10 +19033,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/engine, /area/station/science/xenobiology/cell) -"gSn" = ( -/obj/item/wrench, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gSu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -19189,13 +19127,6 @@ "gTt" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"gTC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/obj/item/crowbar, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gTK" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/south, @@ -20018,9 +19949,7 @@ "hgE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/bridge_pipe/orange/hidden, -/turf/open/floor/iron/stairs/right{ - dir = 8 - }, +/turf/open/floor/iron, /area/station/engineering/atmos) "hgH" = ( /obj/effect/landmark/blobstart, @@ -20831,10 +20760,6 @@ /turf/open/floor/wood, /area/station/maintenance/port/aft) "htD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 1 - }, -/obj/machinery/meter, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, @@ -22472,14 +22397,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"hXn" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos) "hXC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -24569,13 +24486,6 @@ /obj/item/broken_bottle, /turf/open/space/basic, /area/space/nearstation) -"iGr" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port to Filter" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "iGt" = ( /obj/structure/closet/wardrobe/white, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -25191,10 +25101,6 @@ /obj/effect/spawner/random/bureaucracy/pen, /turf/open/floor/iron, /area/station/commons/locker) -"iPx" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "iPB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25931,14 +25837,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"jaO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos) "jaY" = ( /obj/effect/turf_decal/box/red, /obj/machinery/atmospherics/components/unary/outlet_injector{ @@ -26702,12 +26600,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/maintenance/starboard/lesser) -"jms" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "jmv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -30183,19 +30075,6 @@ /obj/structure/chair, /turf/open/floor/carpet/grimey, /area/station/security/interrogation) -"kvK" = ( -/obj/machinery/meter, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kvO" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -31352,10 +31231,8 @@ pixel_y = 4 }, /obj/structure/cable, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, +/obj/item/crowbar, +/obj/item/wrench, /turf/open/floor/iron, /area/station/engineering/atmos) "kRi" = ( @@ -34081,13 +33958,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) -"lNY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lOf" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -34769,14 +34639,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, /area/station/cargo/storage) -"lXL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "lXS" = ( /turf/open/floor/wood, /area/station/smithing) @@ -36513,16 +36375,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"mDA" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix to Engine" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "mDF" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/north, @@ -37427,7 +37279,6 @@ /area/station/maintenance/starboard/greater) "mTI" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, /turf/open/floor/iron, /area/station/engineering/atmos) "mTR" = ( @@ -37930,9 +37781,6 @@ /turf/open/floor/iron/white, /area/station/science/cytology) "nau" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -39424,12 +39272,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) -"nzo" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "nzP" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -39769,7 +39611,6 @@ /turf/open/floor/iron, /area/station/commons/locker) "nGq" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, @@ -40162,15 +40003,6 @@ }, /turf/open/floor/iron, /area/station/commons/locker) -"nOp" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "nOv" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -42667,12 +42499,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"oFt" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/hidden, -/turf/open/floor/iron/stairs/medium{ - dir = 8 - }, -/area/station/engineering/atmos) "oFv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/broken_floor, @@ -46063,6 +45889,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/storage/gas) "pQO" = ( @@ -48487,12 +48314,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) -"qHh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "qHs" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -49258,10 +49079,6 @@ /turf/open/floor/iron, /area/station/commons/dorms) "qTA" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "Mix to Filter" - }, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 4 }, @@ -49596,9 +49413,6 @@ req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/structure/railing{ - dir = 1 - }, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "qZa" = ( @@ -52346,9 +52160,6 @@ /area/station/hallway/secondary/service) "rVJ" = ( /obj/machinery/light/floor/has_bulb, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot{ dir = 1 @@ -52581,10 +52392,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "rZt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 7; + name = "Mix to Incinerator" }, -/obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) "rZy" = ( @@ -52906,12 +52717,6 @@ /obj/item/canvas/twentythree_twentythree, /turf/open/floor/wood, /area/station/service/library) -"sdE" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "sdF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52982,9 +52787,7 @@ /area/space/nearstation) "sfu" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/orange/hidden, -/turf/open/floor/iron/stairs/left{ - dir = 8 - }, +/turf/open/floor/iron, /area/station/engineering/atmos) "sfz" = ( /obj/structure/disposalpipe/segment{ @@ -53881,15 +53684,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) -"swy" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "swR" = ( /obj/machinery/door/airlock{ name = "Cleaning Closet" @@ -54189,9 +53983,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "sCW" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot{ dir = 1 @@ -58570,13 +58361,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/dorms) -"uel" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port Mix to South Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uem" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58871,12 +58655,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"ukq" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "ukv" = ( /obj/structure/rack, /obj/item/clothing/mask/gas, @@ -60675,18 +60453,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"uOp" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uOy" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -63317,10 +63083,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/structure/railing{ - dir = 8; - layer = 4.1 - }, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "vPO" = ( @@ -63519,9 +63281,6 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, @@ -65199,13 +64958,6 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) -"wxe" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wxg" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -67876,7 +67628,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "xpk" = ( @@ -68100,18 +67851,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port) -"xuA" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xuH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69331,12 +69070,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) -"xRc" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xRh" = ( /obj/machinery/door/airlock/external{ name = "Atmospherics External Access" @@ -70051,16 +69784,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/locker) -"ydb" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port to Filter" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ydj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, @@ -112030,8 +111753,8 @@ bLg prT prT fVA -aSB -aSB +cyW +rZt aSB fEA gyg @@ -112287,7 +112010,7 @@ ftd cAt gxb apg -aSB +cyW sBV mei awt @@ -112544,7 +112267,7 @@ dKE mHT tJF nau -aSB +cyW jvj vmx mGl @@ -112801,7 +112524,7 @@ aGS mHT gXW nau -wxe +qwi jvj nnD hfZ @@ -113057,8 +112780,8 @@ hQB hQB mHT egP -gMt -aSB +cyW +cyW jvj nnD jea @@ -113314,8 +113037,8 @@ cyW cyW iQB tds -nzo -aSB +cyW +cyW lxm smt tDt @@ -113564,14 +113287,14 @@ uKa hdp htY ruP -gSn cyW cyW cyW cyW cyW cyW -nzo +cyW +cyW mTI jvj qua @@ -113827,9 +113550,9 @@ cyW vlq cyW cyW -lxt -nzo -aSB +cyW +cyW +cyW iTC smt eNi @@ -114085,8 +113808,8 @@ cyW cyW cyW cyW -nzo -aSB +cyW +cyW dwf nnD elW @@ -114342,8 +114065,8 @@ ruP cyW cyW dfS -nzo -aSB +cyW +cyW cyW kEe fPg @@ -114599,8 +114322,8 @@ hcT kLi kLi kLi -swy -bQY +kLi +kLi kLi sEI tuf @@ -114855,8 +114578,8 @@ ich jnQ tBM jhn -jaO -hXn +jhn +jhn klg jhn svj @@ -115111,9 +114834,9 @@ mHT mHT bRT lLR -nOp -lXL -ydb +xpi +xpi +xpi xpi kUb dfj @@ -115368,10 +115091,10 @@ nGq kRf uQe pul -nzo -iGr -gSn -fzM +cyW +cyW +cyW +cyW qOW nnD huv @@ -115617,18 +115340,18 @@ lMJ lMJ iFR lAh -kvK -iPx -qHh +htD +cyW +cyW cyW fBc -dGq +nau uQe pul -nzo -cQQ +cyW +cyW sCW -lNY +cyW sCW nnD uBg @@ -115879,13 +115602,13 @@ iui vlq cyW jKG -gpQ +cyW uQe pul -nzo -jms +cyW +cyW rVJ -fzM +cyW sCW qua rZV @@ -116132,17 +115855,17 @@ aaa iFR lAh htD -ukq -sdE +cyW +cyW cyW jKG -gpQ +cyW uQe pul -nzo -cQQ +cyW +cyW sCW -fzM +cyW sCW nnD nbx @@ -116389,17 +116112,17 @@ lMJ iFR lAh dhw -xuA -uOp +nOw +nOw nOw cIM -dJK +cyW uQe pul -nzo -fiE +cyW +cyW hur -uel +cyW cyW nnD lRA @@ -116646,17 +116369,17 @@ aaa ktK tts sfu -oFt +sfu hgE qYY fXj vPy tjG xmb -mDA -jZz +cyW +cyW vlq -gTC +cyW cyW qzK vdf @@ -116910,10 +116633,10 @@ isr ldK tqY pul -nzo -fzM -rZt -jZz +cyW +cyW +cyW +cyW cyW ccK lqS @@ -117167,7 +116890,7 @@ isr isr kKq fym -nzo +cyW kNx jtf rdv @@ -117424,7 +117147,7 @@ vTX isr isr dks -nzo +cyW qVi uhx psl @@ -117681,7 +117404,7 @@ vTX ucE vhv bYo -xRc +cyW qTA jZz nnD diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index e46107393b556..86c1c495506bf 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -41832,6 +41832,11 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/medical) +"mkE" = ( +/obj/structure/closet/radiation, +/obj/item/clothing/glasses/meson, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mkK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43319,7 +43324,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/vending/wardrobe/atmos_wardrobe, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "mGT" = ( @@ -81506,11 +81511,10 @@ /turf/open/floor/iron/dark/small, /area/station/science/research) "xZI" = ( -/obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, /obj/effect/turf_decal/bot, /obj/machinery/firealarm/directional/west, /obj/machinery/light/warm/directional/west, +/obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "xZL" = ( @@ -110958,7 +110962,7 @@ vZz sgj sgj iGd -sgj +mkE soH gqa bLN diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index d34edeab4d5cc..876ab8fa444b1 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -21083,6 +21083,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron, /area/station/engineering/atmos/office) "bKY" = ( @@ -21274,6 +21275,7 @@ /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/item/wrench, /turf/open/floor/iron, /area/station/engineering/atmos) "bLX" = ( @@ -21524,13 +21526,6 @@ /obj/machinery/recharge_station, /turf/open/floor/iron, /area/station/engineering/lobby) -"bMX" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Pure to Port" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bMY" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -21817,20 +21812,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"bOn" = ( -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Air to Port" - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"bOo" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to Port" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bOp" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 6 @@ -22334,25 +22315,19 @@ /turf/open/floor/engine/n2o, /area/station/engineering/atmos) "bQJ" = ( -/obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron, /area/station/engineering/atmos) "bQK" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "bQM" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "bQP" = ( @@ -22469,6 +22444,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/office) "bRt" = ( @@ -22697,11 +22673,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"bSf" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bSg" = ( /obj/structure/grille, /turf/open/space, @@ -22838,11 +22809,6 @@ /obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics, /turf/open/floor/iron, /area/station/engineering/atmos/office) -"bSR" = ( -/obj/item/wrench, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bSS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -22850,12 +22816,9 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/office) -"bST" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bSU" = ( /obj/machinery/pipedispenser/disposal/transit_tube, /turf/open/floor/iron, @@ -23143,11 +23106,6 @@ /obj/item/beacon, /turf/open/floor/iron, /area/station/engineering/atmos) -"bTS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bTT" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 8 @@ -24152,9 +24110,6 @@ /area/station/engineering/atmos) "bXC" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -24609,9 +24564,6 @@ /obj/structure/fireaxecabinet{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -29802,9 +29754,6 @@ c_tag = "Atmospherics Mixing" }, /obj/structure/reagent_dispensers/fueltank/large, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -31940,11 +31889,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/science/central) -"feN" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "feU" = ( /obj/structure/table, /obj/item/storage/medkit/o2{ @@ -32610,15 +32554,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"fIA" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to Port" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "fIH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33016,13 +32951,6 @@ /mob/living/basic/butterfly, /turf/open/floor/grass, /area/station/medical/psychology) -"gbu" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port to Filter" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gbK" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -33441,6 +33369,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/office) "guI" = ( @@ -34218,9 +34147,6 @@ /area/station/medical/virology) "hfi" = ( /obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Filter" - }, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -37875,9 +37801,6 @@ "krn" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -41598,7 +41521,6 @@ /area/station/science/xenobiology/cell) "nEp" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "nES" = ( @@ -41929,10 +41851,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/medical/treatment_center) -"nUq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "nUL" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -91775,7 +91693,7 @@ bWO bWO bWO bTQ -ksv +bWO sGc eUb wCz @@ -92794,16 +92712,16 @@ bAy bCO fBp uvr -feN -vsJ -fIA -bST -bOn -bST -bSf -bSR +aAK +bWO +wCz +bWO +hfi +bWO +bWO +bWO hfi -nUq +bWO fDm pyH lRh @@ -93054,13 +92972,13 @@ uTt bWO bWO wCz -bSf +bWO bWO bWO bSj bWO bTR -gbu +bWO fJw qkk keN @@ -93311,12 +93229,12 @@ iJc bWO bWO wCz -bST -bOo -bST -bSf -bST -bTS +bWO +bWO +bWO +bWO +bWO +bWO nEp xXv jty @@ -93568,7 +93486,7 @@ eDR eUb bWO wCz -bMX +bWO bWO bQM bQM diff --git a/_maps/map_files/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm index 9ca26af1b89c3..5b8d619cd8ce2 100644 --- a/_maps/map_files/Theseus/Theseus.dmm +++ b/_maps/map_files/Theseus/Theseus.dmm @@ -3199,14 +3199,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/security/range) -"aXf" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port Mix to North Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "aXh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4755,6 +4747,16 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/airalarm/directional/south, +/obj/structure/rack, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/mask/gas/atmos, +/obj/item/clothing/mask/gas/atmos, +/obj/item/clothing/mask/gas/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "buw" = ( @@ -4762,16 +4764,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"buS" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "bvh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/hatch{ @@ -5259,13 +5251,6 @@ /obj/machinery/power/floodlight, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"bDT" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "bEd" = ( /obj/effect/turf_decal/tile/red/half, /obj/effect/turf_decal/trimline/red/filled/line, @@ -9042,7 +9027,6 @@ /turf/open/floor/iron/dark, /area/station/service/bar) "cIl" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -9588,9 +9572,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/floor/has_bulb/warm, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "cRb" = ( @@ -10262,13 +10243,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) -"dbK" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/layer_manifold/purple/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "dbO" = ( /obj/effect/turf_decal/tile/blue/anticorner{ dir = 1 @@ -11561,18 +11535,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/brig/entrance) -"dvF" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "dvW" = ( /obj/structure/railing{ dir = 4 @@ -12761,14 +12723,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"dNH" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 9 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "dNI" = ( /obj/item/paper_bin{ pixel_x = 7 @@ -13220,7 +13174,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/dorms/laundry) "dUJ" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -14488,11 +14441,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"emU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "enl" = ( /obj/structure/railing{ dir = 4 @@ -15779,15 +15727,6 @@ }, /turf/open/floor/iron, /area/station/science/research) -"eIm" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "eIu" = ( /obj/effect/turf_decal/trimline/dark_green/corner{ dir = 1 @@ -17372,17 +17311,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"fgu" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ - dir = 3 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos) "fgz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/airalarm/directional/west, @@ -17785,14 +17713,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/science/lab) -"fmt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 - }, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "fmv" = ( /obj/structure/table, /obj/item/storage/medkit/regular, @@ -18137,7 +18057,6 @@ /turf/open/floor/wood, /area/station/maintenance/port/lesser) "frO" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot{ dir = 1 @@ -20188,14 +20107,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"fYV" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos) "fYW" = ( /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; @@ -20211,7 +20122,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos/office) "fYX" = ( -/obj/machinery/atmospherics/components/binary/pump, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -25608,9 +25518,6 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "hCL" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -27148,11 +27055,10 @@ "hZC" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/structure/chair{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/suit_storage_unit/atmos, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "hZD" = ( @@ -27230,13 +27136,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"iay" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "iaA" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark, @@ -28188,7 +28087,6 @@ /turf/open/floor/iron/white/textured, /area/station/science/cytology) "ipe" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -29116,20 +29014,6 @@ /obj/structure/marker_beacon/yellow, /turf/open/space/basic, /area/station/solars/port/fore) -"iCr" = ( -/obj/structure/rack, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas/atmos, -/obj/item/clothing/mask/gas/atmos, -/obj/item/clothing/mask/gas/atmos, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos) "iCs" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -33442,17 +33326,6 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) -"jPr" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/meter, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "jPI" = ( /obj/effect/turf_decal/siding/white{ dir = 9 @@ -33646,13 +33519,6 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"jTf" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "jTh" = ( /obj/effect/turf_decal/tile/gray/half/contrasted{ dir = 4 @@ -34435,12 +34301,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"kex" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "key" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -36789,9 +36649,6 @@ /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) "kLo" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -36988,14 +36845,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"kON" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port Mix to South Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "kPb" = ( /obj/effect/decal/cleanable/confetti, /obj/structure/cable, @@ -38529,17 +38378,6 @@ "liN" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/escape) -"liS" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Mix to Filter" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "liY" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 @@ -38892,7 +38730,6 @@ }, /area/station/medical/morgue) "loj" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -39462,7 +39299,6 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) "luT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/warm/directional/south, /turf/open/floor/iron/dark, @@ -42209,27 +42045,11 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) -"mkg" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port to Filter" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mkn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/hydroponics) -"mkw" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Mix to Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mkS" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -43652,13 +43472,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/security/bitden) -"mGO" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mGS" = ( /obj/effect/turf_decal/delivery, /obj/effect/landmark/start/station_engineer, @@ -48456,14 +48269,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"odZ" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Pure to Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "oec" = ( /obj/effect/turf_decal/tile/green/half, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48525,9 +48330,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "oeS" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50426,13 +50228,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"oGW" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "oGX" = ( /obj/machinery/camera/directional/west{ network = list("theater") @@ -50693,13 +50488,6 @@ /obj/machinery/light/directional/east, /turf/open/misc/dirt/station, /area/station/service/hydroponics) -"oMl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "oMm" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -51977,12 +51765,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/security/courtroom) -"phf" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "phj" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -53521,11 +53303,6 @@ "pHL" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter) -"pHR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "pHS" = ( /obj/structure/sink/directional/south, /obj/structure/disposalpipe/segment{ @@ -57093,18 +56870,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"qFb" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "qFg" = ( /obj/machinery/vending/wardrobe/law_wardrobe, /obj/effect/turf_decal/bot, @@ -58154,8 +57919,6 @@ /turf/open/floor/iron, /area/station/commons) "qVh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, -/obj/machinery/meter, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -59240,19 +59003,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"rln" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Waste to Filter" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "rlo" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, @@ -59600,11 +59350,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark/textured_large, /area/station/tcommsat/computer) -"rrb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "rrd" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -60045,13 +59790,6 @@ /obj/structure/sign/poster/official/bless_this_spess/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/upper) -"rwk" = ( -/obj/machinery/atmospherics/components/binary/pump, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "rwy" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -63459,12 +63197,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"sxo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "sxu" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod 2"; @@ -64231,13 +63963,6 @@ }, /turf/open/floor/carpet/red, /area/station/cargo/quartermaster) -"sGX" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "sHf" = ( /obj/effect/spawner/random/trash/food_packaging, /obj/effect/decal/cleanable/dirt/dust, @@ -64732,6 +64457,8 @@ /obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible/layer5{ dir = 4 }, +/obj/item/wrench, +/obj/item/crowbar, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "sOW" = ( @@ -66557,7 +66284,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 5 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "tpC" = ( @@ -67778,12 +67504,6 @@ "tGd" = ( /turf/closed/wall, /area/station/service/hydroponics/garden) -"tGx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/floor/has_bulb/warm, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "tGG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68871,14 +68591,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/security/execution/education) -"tVZ" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "tWb" = ( /obj/effect/turf_decal/tile/blue/half{ dir = 1 @@ -69246,15 +68958,6 @@ "ubk" = ( /turf/closed/wall, /area/station/science/lab) -"ubs" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ubB" = ( /obj/machinery/camera/autoname/directional/north, /obj/item/radio/intercom/directional/north, @@ -73274,7 +72977,6 @@ "vhB" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "vhI" = ( @@ -74113,14 +73815,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/brig/upper) -"vuO" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "vuU" = ( /turf/open/floor/glass/reinforced, /area/station/service/chapel) @@ -74766,16 +74460,6 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron, /area/station/commons/storage/tools) -"vDq" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"vDu" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/wrench, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "vDC" = ( /obj/structure/flora/bush/sparsegrass/style_2, /obj/machinery/light/directional/west, @@ -74951,18 +74635,6 @@ "vGO" = ( /turf/closed/wall, /area/station/construction/mining/aux_base) -"vGS" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Filter" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "vGU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -75631,10 +75303,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "vRD" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Air to Mix"; - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ dir = 4 @@ -79222,9 +78890,6 @@ /turf/open/floor/iron/freezer, /area/station/science/xenobiology/hallway) "wUa" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ - dir = 4 - }, /obj/machinery/atmospherics/components/binary/pump{ name = "Mix to Distro Staging" }, @@ -79638,7 +79303,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "xbt" = ( @@ -79785,14 +79449,6 @@ /obj/structure/transit_tube/horizontal, /turf/open/space/basic, /area/space/nearstation) -"xcY" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "xcZ" = ( /obj/machinery/computer/slot_machine, /obj/effect/decal/cleanable/dirt, @@ -80783,14 +80439,6 @@ "xrv" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/upper) -"xrH" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/obj/item/crowbar, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "xrI" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -82054,14 +81702,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness) -"xMl" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Air to Ports" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "xMq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -131823,7 +131463,7 @@ kqr iIQ aem uqL -iCr +qAH bRM afA lLi @@ -133110,7 +132750,7 @@ qDR qDR qDR qDR -rln +qDR aIO rTR huU @@ -133364,10 +133004,10 @@ jIT dUP dUP dUP -fgu +dUP tpn vhB -fYV +vhB rBI eXW huU @@ -133619,11 +133259,11 @@ uLx nmX kka oCk -qFb -vGS -jPr +kHe +kHe +kHe xbd -dvF +kHe kHe iDM aPo @@ -133876,11 +133516,11 @@ qMY gTd tfn vBt -rrb wiJ -mkg +wiJ +wiJ bIS -dtG +wiJ hDV mwD suP @@ -134133,11 +133773,11 @@ orl ePy tfn frO -sxo +wiJ dUJ -kex +wiJ apU -dtG +wiJ qIj wiJ kjy @@ -134392,9 +134032,9 @@ dZP frO luT loj -jTf +wiJ apU -dtG +wiJ qIj wiJ sMp @@ -134647,11 +134287,11 @@ xxs uKD tfn frO -rrb +wiJ ipe -kex +wiJ laT -dtG +wiJ qIj wiJ qJD @@ -134904,11 +134544,11 @@ iRh pID tfn wiJ -kON -vDu -aXf -dbK -dtG +wiJ +wiJ +wiJ +wiJ +wiJ qIj wiJ xMM @@ -135161,11 +134801,11 @@ lFe nyK tfn wiJ -xrH wiJ -oMl -cer -dtG +wiJ +wiJ +wiJ +wiJ qIj wiJ jsZ @@ -135418,11 +135058,11 @@ duP xmb djr fia -oMl -fmt -tGx -bDT -mGO +wiJ +wiJ +fia +wiJ +wiJ qIj wiJ jsZ @@ -135675,10 +135315,10 @@ xxs uKD tfn wiJ -odZ -mkw -xMl -dtG +wiJ +wiJ +wiJ +wiJ wiJ qIj wiJ @@ -135933,9 +135573,9 @@ crr tfn qoC oeS -eIm -buS -ubs +oeS +hDV +hDV hDV hDV qyq @@ -136189,10 +135829,10 @@ orl iuN tfn eNH -tfn -oMl -liS -mGO +eNH +wiJ +bFK +wiJ isv eTD eTD @@ -136445,8 +136085,8 @@ ntw duP aDu mJw -pHR -dNH +wiJ +eNH iSe wUa eTD @@ -136960,9 +136600,9 @@ fOz bcM pIs vRD -phf -iay -xcY +eNH +wiJ +bFK wiJ wiJ bDS @@ -137218,7 +136858,7 @@ lhI vIG fEX eNH -oGW +wiJ bFK wiJ wiJ @@ -137228,8 +136868,8 @@ mqm uft iQq igA -sGX -emU +wiJ +wiJ qVh yjn lpQ @@ -137475,7 +137115,7 @@ oEH hUw lGt eNH -oGW +wiJ qWB wiJ wiJ @@ -137730,9 +137370,9 @@ oWE dNp tKD lnv -tVZ -phf -kyR +fEX +eNH +wiJ qxb ycY wiJ @@ -137742,9 +137382,9 @@ xRj png iQq mqm -vDq -rwk -vuO +wiJ +qIj +qVh sHE sel sML diff --git a/_maps/map_files/Voidraptor/VoidRaptor.dmm b/_maps/map_files/Voidraptor/VoidRaptor.dmm index 4533e70cd4619..aa939ecab6ad1 100644 --- a/_maps/map_files/Voidraptor/VoidRaptor.dmm +++ b/_maps/map_files/Voidraptor/VoidRaptor.dmm @@ -365,9 +365,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -1071,14 +1068,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/white/diagonal, /area/station/science/research) -"aoi" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix to Ports" - }, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "aot" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -5404,9 +5393,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, /obj/machinery/camera/directional/north{ c_tag = "Atmospherics - Nitrogen Cell"; name = "atmospherics camera" @@ -5696,9 +5682,6 @@ /turf/open/floor/engine, /area/station/science/ordnance/storage) "bIs" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/floor/iron/textured_large, /area/station/engineering/atmos) @@ -6115,7 +6098,6 @@ /turf/open/space/basic, /area/station/solars/aisat) "bOd" = ( -/obj/structure/closet/secure_closet/atmospherics, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -6123,6 +6105,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron/textured_edge, /area/station/engineering/atmos/storage) "bOj" = ( @@ -6705,6 +6688,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron/textured_edge, /area/station/engineering/atmos/storage) "bYX" = ( @@ -7372,9 +7356,6 @@ /area/station/hallway/primary/central) "ciQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 1 }, @@ -9180,18 +9161,6 @@ }, /turf/open/floor/wood/large, /area/station/science/research) -"cLl" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron/textured_edge, -/area/station/engineering/atmos) "cLr" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -9224,18 +9193,6 @@ }, /turf/open/space, /area/space/nearstation) -"cMm" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/textured_edge, -/area/station/engineering/atmos) "cMC" = ( /obj/structure/window/reinforced/fulltile, /obj/structure/flora/bush/sparsegrass/style_random, @@ -9758,13 +9715,6 @@ /obj/structure/trash_pile, /turf/open/floor/iron/textured, /area/station/maintenance/aft) -"cUg" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port to Filter" - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "cUk" = ( /obj/effect/turf_decal/siding/thinplating_new/terracotta/corner{ dir = 4 @@ -12000,13 +11950,6 @@ }, /turf/open/floor/iron/white/textured_large, /area/station/hallway/primary/fore) -"dAj" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port Mix to Starboard Ports" - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "dAp" = ( /obj/machinery/door/airlock/external/ruin, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -13731,10 +13674,10 @@ /turf/closed/wall, /area/station/maintenance/department/science/xenobiology) "dWY" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/bot, /obj/item/stock_parts/power_store/cell/high, /obj/item/lightreplacer, +/obj/structure/table, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos) "dXa" = ( @@ -14808,13 +14751,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured, /area/station/maintenance/department/science/ordnance_maint) -"elk" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Pure to Ports" - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "elm" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -15520,18 +15456,6 @@ }, /turf/open/floor/pod, /area/station/service/chapel/funeral) -"ewu" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/textured_edge, -/area/station/engineering/atmos) "ewC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/dark_red{ @@ -17378,12 +17302,6 @@ dir = 8 }, /area/station/hallway/primary/aft) -"eVM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ - dir = 4 - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "eVW" = ( /obj/effect/spawner/random/trash/garbage, /obj/effect/decal/cleanable/dirt, @@ -18659,9 +18577,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/textured_edge, /area/station/engineering/atmos) @@ -24165,9 +24080,6 @@ }, /obj/item/radio/intercom/directional/east, /obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 4 - }, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 }, @@ -27865,7 +27777,6 @@ /turf/open/floor/iron/white/textured_large, /area/station/medical/medbay/lobby) "hTW" = ( -/obj/structure/closet/secure_closet/atmospherics, /obj/effect/turf_decal/delivery, /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -27874,6 +27785,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron/textured, /area/station/engineering/atmos/storage) "hUa" = ( @@ -28109,9 +28021,6 @@ /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos) "hXV" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -28642,13 +28551,6 @@ "igv" = ( /turf/closed/wall/r_wall, /area/station/security/prison/work) -"igG" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 1 - }, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "ihg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -33913,9 +33815,6 @@ /turf/open/floor/iron/textured_large, /area/station/cargo/storage) "jyF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 4 - }, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 }, @@ -36398,10 +36297,10 @@ }, /area/station/service/hydroponics/garden) "kiN" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/bot, /obj/item/clothing/mask/gas, /obj/item/clothing/glasses/meson/engine/tray, +/obj/structure/table, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos) "kiT" = ( @@ -38376,21 +38275,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/textured_large, /area/station/hallway/primary/aft) -"kIq" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/iron/textured_edge{ - dir = 8 - }, -/area/station/engineering/atmos) "kIt" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -40435,9 +40319,6 @@ }, /area/station/hallway/primary/aft) "llW" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot{ dir = 1 @@ -40621,11 +40502,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/small, /area/station/hallway/secondary/exit/departure_lounge) -"loe" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "lol" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -43579,13 +43455,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/station/engineering/main) -"mcR" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "mcW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/duct, @@ -43893,19 +43762,6 @@ }, /turf/open/floor/iron/textured_large, /area/station/engineering/atmos) -"mhQ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/textured_edge, -/area/station/engineering/atmos) "mhR" = ( /turf/open/floor/light/colour_cycle/dancefloor_a, /area/station/common/night_club) @@ -46197,9 +46053,6 @@ /area/station/medical/surgery) "mPM" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ - dir = 4 - }, /turf/open/floor/iron/textured_large, /area/station/engineering/atmos) "mQl" = ( @@ -46906,13 +46759,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/hfr_room) -"mZX" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port Mix to Port Ports" - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "nac" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47082,9 +46928,6 @@ dir = 1 }, /obj/machinery/light/warm/directional/north, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/textured_edge, /area/station/engineering/atmos) @@ -50622,12 +50465,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/textured, /area/station/science/xenobiology) -"odh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 6 - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "odp" = ( /obj/machinery/holopad, /turf/open/floor/iron/dark/textured_large, @@ -50940,11 +50777,11 @@ /turf/closed/wall, /area/station/science/research) "ohI" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/bot, /obj/item/pipe_dispenser, /obj/item/pipe_dispenser, /obj/item/storage/belt/utility, +/obj/structure/table, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos) "ohO" = ( @@ -51631,13 +51468,6 @@ /obj/effect/spawner/random/food_or_drink/seed, /turf/open/floor/grass, /area/station/service/hydroponics/garden/abandoned) -"orM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 - }, -/obj/machinery/meter, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "orN" = ( /obj/effect/turf_decal/nova_decals/enclave/top/left{ color = "#52B4E9" @@ -51691,9 +51521,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -58347,6 +58174,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, +/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron/textured_edge{ dir = 1 }, @@ -59149,9 +58977,6 @@ /turf/open/floor/iron/dark/textured_large, /area/station/security/prison) "qrH" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/turf_decal/bot{ @@ -61365,9 +61190,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/floor/iron/textured_edge, /area/station/engineering/atmos) @@ -61749,12 +61571,6 @@ }, /turf/open/floor/iron/textured, /area/station/engineering/atmos) -"rch" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 4 - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "rcl" = ( /turf/closed/wall, /area/station/medical/coldroom) @@ -63068,9 +62884,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, /turf/open/floor/iron/textured_edge{ dir = 8 }, @@ -71222,9 +71035,6 @@ /turf/open/floor/wood/large, /area/station/command/heads_quarters/hop) "tFh" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4 - }, /turf/open/floor/iron/textured_corner{ dir = 4 }, @@ -72482,12 +72292,6 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron/half, /area/station/hallway/primary/central) -"uar" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 9 - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "uat" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, @@ -72667,12 +72471,6 @@ }, /turf/open/floor/iron/textured_large, /area/station/command/cc_dock) -"ucH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ - dir = 8 - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "ucK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -78354,7 +78152,6 @@ /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain/private) "vGe" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/bot, /obj/item/book/manual/wiki/atmospherics{ pixel_x = 4; @@ -78363,6 +78160,7 @@ /obj/item/book/manual/wiki/atmospherics, /obj/item/wrench, /obj/item/crowbar/red, +/obj/structure/table, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos) "vGj" = ( @@ -78457,12 +78255,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/textured_large, /area/station/science/ordnance) -"vHo" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 9 - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "vHx" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/secure_closet/atmospherics, @@ -81998,12 +81790,6 @@ }, /turf/open/floor/noslip, /area/station/service/janitor) -"wEJ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron/textured_large, -/area/station/engineering/atmos) "wEK" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -83597,18 +83383,6 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/break_room) -"xgj" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 5 - }, -/turf/open/floor/iron/textured, -/area/station/engineering/atmos) "xgy" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -112199,20 +111973,20 @@ dYh hqu sXd luV -cLl -gqc -gqc -cUg -ajK -ajK -orM -ajK -mZX -ucH -elk -vHo -odh -lGS +pao +dYh +dYh +dYh +dYh +dYh +dYh +dYh +dYh +dYh +dYh +dYh +dYh +dYh ajK ilm dYh @@ -112456,7 +112230,7 @@ dYh hqu ixv fIQ -cMm +pao fYF lSY lSY @@ -112465,7 +112239,7 @@ qrH qrH qrH rvY -loe +dYh muc woC mPM @@ -112713,19 +112487,19 @@ dYh hqu ixv fIQ -cMm +pao nEW lyr -odh -rch -ajK -igG -ajK -dAj -eVM -aoi -lGS -uar +dYh +dYh +dYh +lyr +dYh +dYh +dYh +lyr +dYh +dYh dYh ybS rXo @@ -112973,7 +112747,7 @@ raX foE ieQ ace -mcR +ace ace llW llW @@ -113741,7 +113515,7 @@ dYh nyT cQn fIQ -cMm +pao bzI dVG xrZ @@ -113998,7 +113772,7 @@ dYh vLz hTr pie -ewu +nAn qTQ fDu fKt @@ -114255,7 +114029,7 @@ dYh hqu ixv fIQ -cMm +pao mBF rEk ijx @@ -114512,7 +114286,7 @@ dYh hqu ixv fIQ -mhQ +pao vrU pJO uYv @@ -114785,7 +114559,7 @@ ciQ rwT tFh dYh -wEJ +dYh owP toq uat @@ -115038,11 +114812,11 @@ kMj nbD tDe luV -xgj +lXa jyF gSO cXk -kIq +xsj afb toq dKF diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 4b2517d82e328..3e4198ec6d13c 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -15094,7 +15094,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, -/obj/machinery/space_heater, /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/power/apc/worn_out/directional/north, /obj/structure/cable, @@ -16225,12 +16224,6 @@ }, /turf/open/floor/plating, /area/station/medical/pharmacy) -"dYm" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to East Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "dYn" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -21909,10 +21902,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "fMm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, /area/station/engineering/atmos) "fMs" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -24067,16 +24059,10 @@ /turf/open/floor/iron, /area/station/maintenance/department/security) "gzh" = ( -/obj/structure/table, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 2; - pixel_y = 2 - }, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, -/obj/machinery/pollution_scrubber, +/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron, /area/station/engineering/atmos) "gzi" = ( @@ -30168,19 +30154,10 @@ /turf/open/floor/iron, /area/station/commons/storage/primary) "ivk" = ( -/obj/structure/table, -/obj/item/clothing/head/utility/welding{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/clothing/head/utility/welding{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/multitool, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 }, +/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron, /area/station/engineering/atmos) "ivq" = ( @@ -35043,18 +35020,13 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/port/central) "jUz" = ( -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty, -/obj/item/storage/belt/utility, -/obj/item/t_scanner, -/obj/item/t_scanner, -/obj/item/t_scanner, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, /obj/structure/plaque/static_plaque/atmos{ pixel_x = -32 }, +/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron, /area/station/engineering/atmos) "jUO" = ( @@ -35994,10 +35966,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) -"kkc" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kkd" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -38334,13 +38302,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"kSA" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Pure to Port" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kSE" = ( /obj/structure/closet/crate/coffin, /obj/machinery/light/small/directional/east, @@ -38925,7 +38886,7 @@ /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/portable_atmospherics/pump, +/obj/machinery/space_heater, /turf/open/floor/iron, /area/station/engineering/atmos) "laM" = ( @@ -39293,13 +39254,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) -"lgo" = ( -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ - dir = 8 - }, -/obj/machinery/meter, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lgu" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -40043,9 +39997,6 @@ /turf/open/floor/iron/dark, /area/station/medical/treatment_center) "lrX" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, /turf/open/floor/iron, @@ -40534,13 +40485,6 @@ /obj/structure/industrial_lift/public, /turf/open/floor/plating/elevatorshaft, /area/station/hallway/secondary/construction/engineering) -"lAO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lBK" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -40985,11 +40929,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical) -"lKI" = ( -/obj/structure/chair/stool/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lLq" = ( /obj/structure/bed{ dir = 8 @@ -43623,7 +43562,7 @@ "mAx" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/portable_atmospherics/pump, +/obj/machinery/space_heater, /turf/open/floor/iron, /area/station/engineering/atmos) "mAB" = ( @@ -45162,13 +45101,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) -"nbl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos) "nbm" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -49331,9 +49263,6 @@ }, /area/station/service/chapel) "ora" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -50454,7 +50383,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, -/obj/machinery/space_heater, +/obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/iron, /area/station/engineering/atmos) "oLH" = ( @@ -55940,19 +55869,6 @@ /obj/item/stock_parts/power_store/cell/crap, /turf/open/floor/wood, /area/station/command/meeting_room) -"qsM" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port Mix to West Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"qtb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 8 - }, -/obj/machinery/meter, -/turf/open/floor/iron, -/area/station/engineering/atmos) "qtf" = ( /obj/machinery/camera/directional/west{ c_tag = "Hallway - Port Tram Platform North" @@ -56879,6 +56795,19 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/multitool, +/obj/item/multitool, +/obj/item/multitool, +/obj/item/clothing/head/utility/welding{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/clothing/head/utility/welding{ + pixel_x = -5; + pixel_y = 3 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "qGM" = ( @@ -58173,10 +58102,8 @@ /turf/open/floor/iron, /area/station/ai_monitored/security/armory) "ram" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 4 - }, -/turf/open/floor/iron, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, /area/station/engineering/atmos) "rao" = ( /obj/machinery/door/airlock/security{ @@ -59959,7 +59886,7 @@ c_tag = "Engineering - Atmospherics North" }, /obj/structure/cable, -/obj/machinery/vending/wardrobe/atmos_wardrobe, +/obj/machinery/suit_storage_unit/atmos, /turf/open/floor/iron, /area/station/engineering/atmos) "rDt" = ( @@ -61761,13 +61688,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"sjc" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Port to Filter" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "sji" = ( /turf/closed/wall/rock, /area/station/engineering/supermatter/room) @@ -65818,10 +65738,9 @@ /turf/open/floor/iron/white, /area/station/science/research) "tts" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible{ - dir = 8 - }, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, /area/station/engineering/atmos) "ttw" = ( /obj/structure/table/glass, @@ -66219,16 +66138,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, -/obj/structure/rack, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -68956,7 +68865,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/structure/closet/secure_closet/atmospherics, /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -74192,12 +74100,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"vRm" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Filter" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vRp" = ( /obj/machinery/corral_corner{ mapping_id = "2" @@ -76268,7 +76170,6 @@ }, /obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron, /area/station/engineering/atmos) "wyM" = ( @@ -76353,6 +76254,16 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/stack/sheet/glass/fifty, /turf/open/floor/iron, /area/station/engineering/atmos) "wAe" = ( @@ -77175,10 +77086,6 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron, /area/station/maintenance/starboard/central) -"wNK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wNV" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/white/full, @@ -114982,7 +114889,7 @@ wQm wQm qpu hIO -jLU +tts hYd wxf eIM @@ -115239,7 +115146,7 @@ mfB mfB qga exl -oNq +ram pHM ahD fKg @@ -115496,7 +115403,7 @@ wQm kdw aOV wXO -doa +fMm amS tLz xTM @@ -116254,14 +116161,14 @@ bmX wUv roD ldy -nbl -qsM -ram -lAO -ram -vRm -fMm -kkc +fja +wQm +wQm +wQm +wQm +wQm +wQm +wQm kkb wQm oaX @@ -116511,13 +116418,13 @@ pAD apG nNQ wQm -lgo +wQm wQm vkO wAG rvK vkO -sjc +wQm wQm dxd wQm @@ -116768,13 +116675,13 @@ uxG apH hYK rAg -wNK -dYm -tts -qtb -tts -tts -lKI +wQm +wQm +wQm +wQm +wQm +wQm +wQm gjC sPC wQm @@ -117025,7 +116932,7 @@ apy apI nNQ dsH -kSA +wQm wQm ora ora From 972b99bbb87679819b022bb191d4412ad54b7498 Mon Sep 17 00:00:00 2001 From: Greenpoison Date: Sun, 26 Oct 2025 14:18:45 +0000 Subject: [PATCH 2/4] Metastation Pump to Turbine made me hit the boof --- _maps/map_files/MetaStation/MetaStation.dmm | 37 +++------------------ 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b93560af4729e..02da6b853bb73 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -631,11 +631,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"akZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, -/turf/closed/wall, -/area/station/engineering/atmos) "alg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -2685,10 +2680,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"aSB" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "aSD" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/east, @@ -6310,7 +6301,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "cnz" = ( @@ -15573,7 +15563,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, /obj/machinery/computer/atmos_control/nitrogen_tank{ dir = 1 }, @@ -18021,10 +18010,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"gyg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "gyr" = ( /obj/structure/chair{ dir = 1 @@ -21530,7 +21515,6 @@ /area/station/maintenance/starboard/fore) "hHt" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "hHx" = ( @@ -41893,7 +41877,6 @@ /obj/structure/sign/warning/fire/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "ouX" = ( @@ -44815,7 +44798,6 @@ /obj/machinery/atmospherics/components/binary/valve/digital{ name = "Waste Release" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer1, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "pxN" = ( @@ -52391,13 +52373,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"rZt" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 7; - name = "Mix to Incinerator" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rZy" = ( /obj/machinery/camera/directional/east{ c_tag = "AI Chamber - Starboard"; @@ -67177,8 +67152,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/obj/machinery/meter, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "xhf" = ( @@ -110729,7 +110702,7 @@ diC fWA hum iwt -akZ +iwt wIB viH nng @@ -110986,7 +110959,7 @@ qRM cGS kkf kLp -gyg +smZ uwQ cii niY @@ -111754,10 +111727,10 @@ prT prT fVA cyW -rZt -aSB +cyW +cyW fEA -gyg +smZ lAh aaf gWn From 93cfa0c7ac72f2795653927c1ccae2fd1fd46b14 Mon Sep 17 00:00:00 2001 From: Greenpoison Date: Sun, 26 Oct 2025 15:12:16 +0000 Subject: [PATCH 3/4] All maps now have a firefighting foam tank in atmos. --- _maps/map_files/Blueshift/Blueshift.dmm | 2 + _maps/map_files/BoxStation/BoxStation.dmm | 1 + .../map_files/Deltastation/DeltaStation2.dmm | 3 +- _maps/map_files/Graveyard/Graveyard.dmm | 1 + _maps/map_files/Heliostation/Heliostation.dmm | 13 +++++- .../map_files/IceBoxStation/IceBoxStation.dmm | 2 +- _maps/map_files/KiloStation/KiloStation.dmm | 1 + .../LeadPoisoningStation.dmm | 1 + _maps/map_files/MetaStation/MetaStation.dmm | 41 ++++++++++--------- _maps/map_files/Ouroboros/Ouroboros.dmm | 1 + _maps/map_files/PubbyStation/PubbyStation.dmm | 13 +++++- _maps/map_files/Theseus/Theseus.dmm | 1 + _maps/map_files/Voidraptor/VoidRaptor.dmm | 1 + 13 files changed, 57 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 6b48ef1b8710d..378380be83699 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -27695,6 +27695,7 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/toy/figure/engineer, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron/dark, /area/station/engineering/main) "fnq" = ( @@ -53729,6 +53730,7 @@ }, /obj/machinery/light/directional/east, /obj/machinery/camera/autoname/directional/east, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron/dark/side{ dir = 4 }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index e19b676f47510..6db32a3ac6ea3 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -70526,6 +70526,7 @@ "wCX" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/light/small/directional/west, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "wDe" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index eef6375a37cc5..898017713e762 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -43678,6 +43678,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/stripes/line, +/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/atmos) "khN" = ( @@ -71790,11 +71791,11 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, -/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron, /area/station/engineering/atmos) "qUA" = ( diff --git a/_maps/map_files/Graveyard/Graveyard.dmm b/_maps/map_files/Graveyard/Graveyard.dmm index 99dfde2ea3760..93c915b4caa1b 100644 --- a/_maps/map_files/Graveyard/Graveyard.dmm +++ b/_maps/map_files/Graveyard/Graveyard.dmm @@ -43467,6 +43467,7 @@ dir = 4 }, /obj/machinery/light/directional/north, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron, /area/station/engineering/atmos) "qRC" = ( diff --git a/_maps/map_files/Heliostation/Heliostation.dmm b/_maps/map_files/Heliostation/Heliostation.dmm index 165d4a0fe1ebe..71cb0882ca049 100644 --- a/_maps/map_files/Heliostation/Heliostation.dmm +++ b/_maps/map_files/Heliostation/Heliostation.dmm @@ -38320,6 +38320,17 @@ /obj/machinery/station_map/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"hDQ" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/reagent_dispensers/foamtank, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos) "hDX" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -105640,7 +105651,7 @@ rrX cwt iPp qDQ -rxk +hDQ rxk uBx rxk diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 2268a854b96d2..d8fc8f038b094 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -7673,7 +7673,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/structure/reagent_dispensers/plumbed, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "cmL" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ac971cb12ee99..49abcf634665b 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -42558,6 +42558,7 @@ }, /obj/effect/turf_decal/tile/blue, /obj/machinery/light/directional/east, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron, /area/station/engineering/atmos) "niB" = ( diff --git a/_maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm b/_maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm index bdc3b35944fac..e9adf55acddee 100644 --- a/_maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm +++ b/_maps/map_files/LeadPoisoningStation/LeadPoisoningStation.dmm @@ -10030,6 +10030,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron, /area/station/engineering/atmos) "eTG" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 02da6b853bb73..3ec89b8db49b5 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1368,6 +1368,26 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -9741,26 +9761,6 @@ /turf/open/space/basic, /area/space) "dBZ" = ( -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = -4; - pixel_y = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -9770,6 +9770,7 @@ /obj/machinery/light_switch/directional/west, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron/dark/corner{ dir = 1 }, diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index 86c1c495506bf..89de2b160aea9 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -23410,6 +23410,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron, /area/station/engineering/atmos) "gWJ" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 876ab8fa444b1..c0ef00448d594 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -30074,6 +30074,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"dIr" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/reagent_dispensers/foamtank, +/turf/open/floor/iron, +/area/station/engineering/atmos) "dJm" = ( /obj/machinery/door/airlock/research/glass{ name = "Research Pit" @@ -93225,7 +93236,7 @@ bCP bHw bCP fBp -iJc +dIr bWO bWO wCz diff --git a/_maps/map_files/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm index 5b8d619cd8ce2..aaf5f5342da06 100644 --- a/_maps/map_files/Theseus/Theseus.dmm +++ b/_maps/map_files/Theseus/Theseus.dmm @@ -4315,6 +4315,7 @@ "bmO" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/camera/autoname/directional/north, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "bmX" = ( diff --git a/_maps/map_files/Voidraptor/VoidRaptor.dmm b/_maps/map_files/Voidraptor/VoidRaptor.dmm index aa939ecab6ad1..f0d6c046a4ff1 100644 --- a/_maps/map_files/Voidraptor/VoidRaptor.dmm +++ b/_maps/map_files/Voidraptor/VoidRaptor.dmm @@ -31408,6 +31408,7 @@ dir = 5 }, /obj/machinery/light/directional/north, +/obj/structure/reagent_dispensers/foamtank, /turf/open/floor/iron/textured, /area/station/engineering/atmos) "iTt" = ( From 64453f3e06a296ffa1fcaed9a5624178949a25f2 Mon Sep 17 00:00:00 2001 From: Greenpoison Date: Mon, 27 Oct 2025 19:13:29 +0000 Subject: [PATCH 4/4] Removed left over straggling cyan line on helio --- _maps/map_files/Heliostation/Heliostation.dmm | 39 +++---------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/_maps/map_files/Heliostation/Heliostation.dmm b/_maps/map_files/Heliostation/Heliostation.dmm index 71cb0882ca049..37066c36d0086 100644 --- a/_maps/map_files/Heliostation/Heliostation.dmm +++ b/_maps/map_files/Heliostation/Heliostation.dmm @@ -1422,18 +1422,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"agI" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Air to Ports" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/engineering/atmos) "agJ" = ( /obj/structure/chair/office, /obj/machinery/firealarm/directional/west, @@ -56070,9 +56058,6 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "omW" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron, @@ -68563,13 +68548,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"tbh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/iron, -/area/station/engineering/atmos) "tbj" = ( /obj/structure/table, /obj/item/stack/package_wrap{ @@ -72748,13 +72726,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"uGc" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uGf" = ( /obj/machinery/door/airlock/glass{ name = "Legal Consultation" @@ -103336,7 +103307,7 @@ qDd eSD uPO uPO -agI +uPO uPO uPO xyg @@ -103593,7 +103564,7 @@ mbq cAe crj crj -tbh +crj crj crj crj @@ -103850,7 +103821,7 @@ rKd oGj crj crj -cyL +crj crj dyf ood @@ -104107,7 +104078,7 @@ off aZY crj crj -uGc +nlQ fCA crj crj @@ -104364,7 +104335,7 @@ tti uma crj crj -uGc +nlQ crj crj crj