From a7f223783b3f11be62c54ca4102338587a9208ae Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 01:17:04 -0600 Subject: [PATCH 01/22] IceBox Atmospherics Expansion - Infiltrate and Exfiltrate Hey there, I've seen like three screenshots of people working on revamping IceBox's atmospherics but literally none of them have followed through on it, so I've decided to make Multi-Z Atmospherics (boo). HOWEVER, it's not what you think. I play an atmospheric technician in game, and I tried to get a consistent strike between having the bare basics set up- while still having plenty of freedom to set up stuff with as you wish and get all the stuff from the atmospherics loop. Here's the pretties: There's a little small portion hidden on the third z-level, but you can see a little bit peeking out. This does add some complexity to the atmospherics loop- but I think that the simplicity it offers later on when you interact with the minor loop on the lower z-level can not be understated. I think toying around with the "Box" atmospherics system and loop is just... too much to handle right now, so I thought to just build off the current loop and make the "minor" loop. I also played around with catwalks and decals- and I think the decals add a little more context to what the pipes do. I played around some with the industrial theme (having catwalks over the HFR area and the "minor loop"), and I like the way it comes off in game. I definitely took inspiration from stuff like _Chernobyl_ as far as having catwalks directly above the optimal placement for the HFR. I decided to rely on shutters for more open flow rather than have obtuse windows. Why "infiltrate" and "exfiltrate" for the minor loops? It sounds like "filtrate", which is something that you do in atmos (harvest and filter the gases you get from your various machinery). I also _really_ wanted to ensure that any new terminology I introduce would not be used in any other application in atmospherics (stuff like "vent", "input/output", etc will simply not do), so I do not think I will change it unless a good idea is offered up by you fine people. Simply put: this is the atmospherics I want to see, and I think it's a good change. It adds features that IceBox simply did not have at all (making it worse than other maps), and pencils out the boundaries of atmospherics mapping+planning. --- .../map_files/IceBoxStation/IceBoxStation.dmm | 4112 ++++++++++++----- 1 file changed, 2964 insertions(+), 1148 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b0b2bf46f345d7..dca28a0b1775c1 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -221,6 +221,17 @@ /obj/item/clothing/mask/gas, /turf/open/floor/iron/smooth, /area/mine/living_quarters) +"aeN" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/line, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "aeZ" = ( /obj/machinery/space_heater, /turf/open/floor/plating{ @@ -505,8 +516,22 @@ /area/station/engineering/transit_tube) "alp" = ( /obj/machinery/airalarm/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 9 + }, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "alv" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -643,6 +668,8 @@ /area/station/command/heads_quarters/captain) "anE" = ( /obj/structure/sign/poster/random/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -902,6 +929,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/hallway) +"aqX" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "arb" = ( /obj/structure/table, /obj/item/folder/red, @@ -1308,14 +1341,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/science/research) -"axi" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/atmos{ - name = "Atmospherics" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "axm" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -1386,7 +1411,17 @@ /area/station/engineering/atmos) "axT" = ( /obj/machinery/light/small/directional/south, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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) "axX" = ( /obj/structure/cable, @@ -1608,6 +1643,11 @@ icon_state = "wood-broken2" }, /area/station/security/prison/rec) +"aDn" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "aDo" = ( /obj/structure/chair/office{ dir = 4 @@ -1776,6 +1816,16 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"aFL" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/button/door/directional/north{ + id = "Atmospherics Project Shutters"; + name = "Atmospherics Project Shutters"; + req_access = list("atmospherics") + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "aFP" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -3647,6 +3697,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "bkg" = ( @@ -3723,14 +3774,6 @@ dir = 1 }, /area/station/security/prison/workout) -"bkY" = ( -/obj/item/radio/intercom/directional/south, -/obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/aisat_interior) "bla" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3825,6 +3868,25 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/medbay/aft) +"bnf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/dark_red/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "bnh" = ( /obj/machinery/door/window/left/directional/north{ dir = 4; @@ -3875,6 +3937,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +"bnH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "bnJ" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -3976,6 +4046,12 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/closed/wall/r_wall, /area/station/maintenance/department/medical/central) +"boU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "boV" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -4150,6 +4226,15 @@ /obj/item/clothing/head/beanie/stripedred, /turf/open/floor/iron, /area/mine/laborcamp/security) +"bsf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/light_switch/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "bsi" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -4239,6 +4324,17 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) +"bsX" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/layer_manifold/pink/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/line, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "bta" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -4528,6 +4624,12 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"bxt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/station/maintenance/aft/lesser) "bxy" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -4751,10 +4853,6 @@ pixel_x = -11; pixel_y = 7 }, -/obj/item/pen{ - pixel_x = 1; - pixel_y = 9 - }, /turf/open/floor/wood{ icon_state = "wood-broken5" }, @@ -4778,6 +4876,12 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/textured, /area/station/security/execution/transfer) +"bBs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "bBw" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -5087,6 +5191,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"bFD" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4; + name = "Exfiltrate To Port" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "bFL" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -5635,6 +5747,12 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"bPD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/electrolyzer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "bPE" = ( /obj/structure/table, /obj/item/radio/intercom/directional/east, @@ -5910,8 +6028,9 @@ name = "Atmospherics" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/station/maintenance/aft/greater) +/area/station/engineering/atmos/storage) "bVe" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -6186,6 +6305,16 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/security/processing) +"bYI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_green/end{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "bYK" = ( /obj/effect/landmark/start/chemist, /obj/structure/chair/office/light{ @@ -6731,6 +6860,14 @@ /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, /area/station/medical/pharmacy) +"chn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "chB" = ( /obj/machinery/door/airlock{ id_tag = "Toilet1"; @@ -7014,6 +7151,13 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"cmj" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/layer_manifold/general{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "cmq" = ( /obj/machinery/door/airlock/external{ name = "External Access" @@ -7116,6 +7260,14 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"cnY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "col" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -7475,6 +7627,12 @@ icon_state = "wood-broken" }, /area/station/maintenance/space_hut/cabin) +"cuG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance/three, +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "cuL" = ( /obj/structure/table/wood, /obj/machinery/light/directional/west, @@ -9141,6 +9299,26 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"cTQ" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics Project Room West" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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/storage) "cTV" = ( /obj/effect/turf_decal/box/white{ color = "#52B4E9" @@ -9618,12 +9796,22 @@ /turf/open/floor/plating, /area/station/security/prison/safe) "dbN" = ( -/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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/maintenance/disposal/incinerator) +/area/station/engineering/atmos/storage) "dcb" = ( /obj/machinery/door/airlock/maintenance{ name = "Garden Maintenance" @@ -9864,6 +10052,9 @@ "dfB" = ( /turf/open/floor/iron/white/corner, /area/station/hallway/primary/starboard) +"dfE" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/hfr_room) "dfF" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plating, @@ -10090,6 +10281,20 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"diY" = ( +/obj/structure/rack, +/obj/item/crowbar, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) +"djf" = ( +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "djr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10193,6 +10398,19 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/wood/parquet, /area/station/commons/lounge) +"dkV" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/station/engineering/atmos/storage) +"dkX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/duct, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "dkY" = ( /obj/structure/chair/office{ dir = 4 @@ -11373,6 +11591,12 @@ /obj/machinery/duct, /turf/open/floor/wood, /area/station/hallway/secondary/service) +"dCm" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "dCo" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -11665,6 +11889,15 @@ /obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +"dGX" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/shower{ + tag = "icon-shower (WEST)"; + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "dHn" = ( /obj/structure/table, /obj/effect/turf_decal/siding/white{ @@ -11728,7 +11961,17 @@ /area/station/hallway/secondary/service) "dIs" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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) "dIy" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -12602,6 +12845,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"dXI" = ( +/obj/machinery/atmospherics/pipe/multiz/pink/visible{ + dir = 8; + name = "Exfiltrate" + }, +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/effect/turf_decal/tile/red/diagonal_edge, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/atmos/storage) "dXR" = ( /obj/machinery/camera/directional/west{ c_tag = "Quartermaster's Office" @@ -12882,6 +13137,12 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"edk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "edn" = ( /obj/effect/turf_decal/bot_white/right, /obj/machinery/ore_silo, @@ -12897,6 +13158,9 @@ /obj/structure/cable, /turf/open/floor/iron/large, /area/station/engineering/atmos/storage/gas) +"edE" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "edT" = ( /obj/structure/grille/broken, /turf/open/floor/plating, @@ -13018,6 +13282,10 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"ege" = ( +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "egf" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) @@ -13775,7 +14043,7 @@ /obj/machinery/portable_atmospherics/canister, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "erY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13986,6 +14254,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +"ewk" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "ewq" = ( /obj/machinery/light_switch/directional/north, /obj/machinery/light/directional/north, @@ -14512,6 +14785,11 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/carpet, /area/station/commons/dorms) +"eFv" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "eFw" = ( /obj/structure/sign/poster/official/report_crimes, /turf/closed/wall/ice, @@ -14957,6 +15235,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"eNk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "eNl" = ( /obj/structure/chair/comfy/black, /obj/effect/landmark/start/head_of_security, @@ -15094,6 +15379,12 @@ /turf/open/floor/iron, /area/station/cargo/qm) "ePP" = ( +/obj/structure/sign/warning/gas_mask{ + pixel_x = 32 + }, +/obj/structure/sign/warning/cold_temp{ + pixel_x = -32 + }, /turf/open/floor/plating, /area/station/engineering/atmos) "ePR" = ( @@ -15758,11 +16049,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"eZm" = ( -/obj/structure/disposalpipe/segment, -/obj/item/trash/raisins, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "eZo" = ( /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, @@ -15866,6 +16152,10 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron, /area/station/commons/fitness) +"fbe" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage) "fbh" = ( /obj/machinery/power/tracker, /obj/structure/cable, @@ -15889,6 +16179,11 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/station/hallway/primary/central) +"fbx" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "fbC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15974,6 +16269,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"fcO" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/machinery/atmospherics/pipe/multiz/pink/visible{ + dir = 4; + name = "Exfiltrate" + }, +/obj/effect/turf_decal/tile/red/diagonal_edge, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/atmos/mix) "fcP" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -16262,7 +16566,23 @@ name = "Atmospherics" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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) "fii" = ( /obj/effect/spawner/structure/window/reinforced, @@ -16545,6 +16865,9 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "flI" = ( @@ -17562,12 +17885,6 @@ /obj/machinery/requests_console/auto_name/directional/west, /turf/open/floor/iron/white, /area/station/medical/virology) -"fEh" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "fEA" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance{ @@ -17595,6 +17912,20 @@ dir = 4 }, /area/station/security/checkpoint/auxiliary) +"fEP" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/dark_red/corner{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "fER" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 4 @@ -17695,6 +18026,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/qm) +"fGk" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "fGn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17724,12 +18061,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/primary/port) -"fGT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "fHb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/cold_temp, @@ -17794,6 +18125,10 @@ /obj/machinery/holopad, /turf/open/floor/carpet, /area/station/command/meeting_room) +"fHZ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "fIs" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -17992,6 +18327,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/break_room) +"fLk" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/flashlight/lamp{ + on = 0 + }, +/turf/open/floor/wood, +/area/station/maintenance/aft/greater) "fLl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19708,6 +20051,10 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/wood, /area/station/service/library) +"goo" = ( +/obj/structure/sign/poster/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "goq" = ( /obj/structure/statue/snow/snowman, /turf/open/misc/asteroid/snow/standard_air, @@ -19972,7 +20319,7 @@ }, /obj/machinery/disposal/bin, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "gtF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -20048,14 +20395,31 @@ }, /area/station/science/research) "gwu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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/maintenance/disposal/incinerator) +/area/station/engineering/atmos/storage) "gwy" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -21889,6 +22253,17 @@ /obj/item/pen, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"gYP" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_green/line, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "gZa" = ( /obj/structure/sign/nanotrasen{ pixel_x = -32 @@ -22051,6 +22426,11 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"hbf" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "hbp" = ( /obj/machinery/photocopier, /turf/open/floor/wood, @@ -22145,6 +22525,17 @@ }, /turf/open/floor/plating, /area/station/science/xenobiology) +"hcY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_green/line, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "hdf" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -22663,6 +23054,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"hku" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/mix) "hkU" = ( /obj/effect/landmark/start/cargo_technician, /obj/structure/chair/office{ @@ -22758,6 +23153,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/greater) +"hmG" = ( +/obj/effect/turf_decal/arrows/white{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "hnf" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -22821,12 +23225,32 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) +"hoj" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Atmospherics HFR Shutters"; + name = "Atmospherics HFR Shutters"; + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "hor" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, /obj/item/radio/intercom/directional/south, /turf/open/floor/stone, /area/mine/eva/lower) +"hos" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "hoC" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -22841,8 +23265,8 @@ /area/station/cargo/miningdock) "hoF" = ( /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 4 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -23127,8 +23551,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "htn" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/trash/raisins, /turf/open/floor/plating, /area/station/maintenance/aft/greater) "hto" = ( @@ -23178,6 +23602,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/command/meeting_room) +"hug" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "hux" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/cafeteria, @@ -23229,12 +23659,11 @@ /turf/open/floor/iron, /area/station/service/chapel) "huL" = ( -/obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/camera/directional/south{ c_tag = "Atmospherics Project Room East" }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/turf/open/openspace, +/area/station/engineering/atmos/storage) "huN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23700,11 +24129,28 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"hCR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "hCV" = ( /obj/structure/table/wood, /obj/item/hand_tele, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"hDa" = ( +/obj/effect/turf_decal/arrows/white, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) +"hDd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "hDf" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1; @@ -23880,6 +24326,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/teleporter) +"hGk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4; + name = "Exfiltrate To Waste" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "hGA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23973,6 +24427,10 @@ }, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +"hIb" = ( +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "hIi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -24194,6 +24652,15 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"hMy" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hMz" = ( /obj/structure/marker_beacon/burgundy{ name = "landing marker" @@ -24687,6 +25154,7 @@ "hTR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/grille_or_waste, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "hUe" = ( @@ -24730,6 +25198,12 @@ c_tag = "Atmospherics South East"; dir = 6 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "hUx" = ( @@ -24758,11 +25232,6 @@ "hUD" = ( /turf/closed/wall, /area/station/service/library) -"hUG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "hUK" = ( /obj/structure/railing{ dir = 4 @@ -24793,11 +25262,32 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/mine/laborcamp) +"hVD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_green/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "hVI" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/mine/eva) +"hVU" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "hVY" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/hollow/reinforced/middle, @@ -25189,6 +25679,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/medical/cryo) +"icz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "icF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -25351,6 +25848,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"ifd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "ife" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25608,6 +26112,10 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +"ijc" = ( +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/textured_large, +/area/station/engineering/atmos/project) "iji" = ( /obj/structure/table, /obj/item/multitool/circuit{ @@ -25737,6 +26245,17 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"ikJ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_green/line, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "ikM" = ( /obj/structure/ladder, /turf/open/floor/plating, @@ -25758,10 +26277,6 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/station/security/courtroom) -"ili" = ( -/obj/structure/marker_beacon/burgundy, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "ily" = ( /turf/open/openspace, /area/station/science/xenobiology) @@ -26204,6 +26719,16 @@ }, /turf/open/floor/iron/white, /area/mine/laborcamp) +"itN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "itY" = ( /obj/effect/spawner/random/maintenance, /turf/open/floor/plating/snowed/icemoon, @@ -26272,15 +26797,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/security/armory/upper) -"ivf" = ( -/obj/structure/sign/warning/fire{ - pixel_y = -32 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics Project Room West" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "ivo" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -26721,6 +27237,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"iCM" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/mix) "iCO" = ( /obj/machinery/vending/cola/red, /turf/open/floor/iron/dark/textured, @@ -26830,10 +27349,11 @@ /area/station/security/warden) "iFl" = ( /obj/structure/table, -/obj/item/flashlight/lamp{ - on = 0 - }, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/pen{ + pixel_x = 1; + pixel_y = 9 + }, /turf/open/floor/wood, /area/station/maintenance/aft/greater) "iFm" = ( @@ -26930,6 +27450,18 @@ /obj/structure/cable, /turf/open/floor/carpet/red, /area/station/security/prison/work) +"iHY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "iIa" = ( /obj/structure/cable, /obj/structure/railing, @@ -27102,6 +27634,13 @@ "iJO" = ( /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"iJR" = ( +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "iJY" = ( /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -27110,6 +27649,12 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +"iKe" = ( +/obj/structure/no_effect_signpost{ + desc = "Now, where to go from here? That's a timeless question." + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "iKk" = ( /obj/effect/landmark/xeno_spawn, /obj/structure/cable, @@ -27410,6 +27955,10 @@ "iNQ" = ( /turf/open/floor/carpet, /area/station/maintenance/space_hut/cabin) +"iNX" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "iOc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27629,15 +28178,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) -"iRB" = ( -/obj/machinery/light/directional/east, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) "iRC" = ( /obj/structure/sign/warning/electric_shock{ pixel_y = 32 @@ -28059,6 +28599,12 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/chemistry) +"iXZ" = ( +/obj/effect/turf_decal/weather/snow, +/turf/open/floor/plating/icemoon{ + icon_state = "panelscorched" + }, +/area/icemoon/surface/outdoors/nospawn) "iYb" = ( /turf/closed/wall, /area/station/maintenance/central/greater) @@ -28430,6 +28976,18 @@ dir = 9 }, /area/station/science/research) +"jdU" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/sheet/plasteel/twenty{ + pixel_x = 3; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "jeb" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -28576,12 +29134,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"jhg" = ( -/obj/machinery/firealarm/directional/north, -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "jhy" = ( /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, @@ -28692,6 +29244,18 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"jjE" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_green/filled/warning, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "Infiltrate to Exfiltrate" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "jjG" = ( /obj/item/instrument/harmonica, /obj/item/instrument/guitar, @@ -28919,6 +29483,16 @@ dir = 1 }, /area/mine/eva/lower) +"jnH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jnM" = ( /obj/structure/chair/sofa, /turf/open/floor/carpet/blue, @@ -28970,6 +29544,10 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"joz" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "joB" = ( /obj/item/beacon, /obj/effect/turf_decal/stripes/line{ @@ -29192,6 +29770,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/office) +"jsW" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "jsX" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -29445,6 +30033,20 @@ /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +"jwd" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_green/end{ + dir = 1 + }, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "jwj" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -29660,6 +30262,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/space_hut/cabin) +"jAW" = ( +/turf/closed/wall, +/area/station/engineering/atmos/hfr_room) "jAZ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -30007,12 +30612,6 @@ /obj/machinery/computer/warrant, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"jHv" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "jHF" = ( /obj/item/trash/boritos/red, /obj/structure/cable, @@ -30477,6 +31076,22 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"jNS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "jNZ" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 9 @@ -31048,14 +31663,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/open/floor/iron/white, /area/station/medical/virology) +"jWh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "jWj" = ( -/obj/item/radio/intercom/directional/north, /obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "jWl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -31356,6 +31980,12 @@ /obj/machinery/field/generator, /turf/open/floor/plating, /area/station/engineering/engine_smes) +"kbK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "kbQ" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light/directional/south, @@ -31974,6 +32604,14 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"kkI" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + name = "Exfiltrate Port"; + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "kkN" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -32160,6 +32798,9 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos) +"kpk" = ( +/turf/open/openspace, +/area/station/engineering/atmos/storage) "kpp" = ( /obj/structure/table/wood, /obj/item/storage/box/matches, @@ -32171,6 +32812,10 @@ /obj/item/reagent_containers/food/drinks/flask/gold, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"kpw" = ( +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "kpz" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/bot, @@ -32277,13 +32922,21 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "kqP" = ( -/obj/effect/turf_decal/stripes/line, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "kqR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32417,6 +33070,25 @@ /obj/structure/displaycase, /turf/open/floor/iron, /area/mine/living_quarters) +"ksm" = ( +/obj/structure/table/reinforced, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/core{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - HFR"; + name = "atmospherics camera" + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "kso" = ( /obj/structure/fence/corner{ dir = 6 @@ -32641,6 +33313,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/structure/steam_vent, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) "kvN" = ( @@ -32808,15 +33483,20 @@ /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/medical) -"kzp" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/structure/cable, -/obj/machinery/light_switch/directional/north, -/obj/structure/closet/radiation, +"kzo" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) +/area/station/engineering/atmos/hfr_room) +"kzp" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "kzr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -32895,6 +33575,12 @@ /obj/item/multitool, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"kzT" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "kzW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33325,6 +34011,13 @@ /obj/item/clothing/head/bandana, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"kHf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "kHn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/south, @@ -33497,9 +34190,9 @@ /area/station/ai_monitored/turret_protected/aisat_interior) "kJK" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "kJO" = ( @@ -33801,6 +34494,15 @@ }, /turf/open/floor/iron, /area/station/security/brig/upper) +"kNS" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 8 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "kNW" = ( /turf/closed/wall, /area/station/cargo/warehouse) @@ -33825,6 +34527,10 @@ }, /turf/open/floor/iron, /area/station/security/brig/upper) +"kOD" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "kOE" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; @@ -33912,6 +34618,11 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"kPQ" = ( +/obj/structure/transit_tube/crossing, +/obj/structure/cable, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "kQc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34234,6 +34945,13 @@ }, /turf/open/floor/iron/dark/side, /area/mine/eva) +"kTF" = ( +/obj/effect/turf_decal/trimline/dark_green/corner, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "kTO" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/blue, @@ -34404,6 +35122,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/storage) +"kXg" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "kXq" = ( /obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, @@ -35035,6 +35757,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"lif" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "lim" = ( /obj/machinery/conveyor{ dir = 4; @@ -35080,6 +35808,16 @@ /obj/machinery/meter/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) +"liG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "liI" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -35307,6 +36045,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/donk, /area/mine/production) +"lla" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "lli" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -35553,19 +36302,8 @@ /turf/open/floor/iron, /area/station/security/checkpoint/auxiliary) "lpJ" = ( -/obj/structure/sign/warning/deathsposal{ - pixel_y = 32 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/disposal/bin, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "lpM" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain) @@ -35720,9 +36458,19 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/wood/parquet, /area/station/commons/lounge) +"lrV" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "lso" = ( /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"lsJ" = ( +/obj/structure/cable, +/obj/structure/transit_tube/crossing/horizontal, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "lsN" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -35797,6 +36545,16 @@ /obj/item/grenade/chem_grenade/smart_metal_foam, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) +"lum" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "lup" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -35909,6 +36667,14 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/wood/tile, /area/station/service/theater) +"lvP" = ( +/obj/machinery/light/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) "lvQ" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, @@ -35938,6 +36704,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/dorms) +"lvZ" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "lwi" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -36128,6 +36899,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/medical/chemistry) +"lAg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "lAt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36706,16 +37483,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/icemoon, /area/station/hallway/secondary/entry) -"lJA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/atmospherics, -/obj/effect/turf_decal/bot, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) "lJO" = ( /turf/closed/wall, /area/station/maintenance/port/fore) @@ -37171,6 +37938,12 @@ /obj/machinery/atmospherics/components/trinary/mixer/airmix{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "lTa" = ( @@ -37257,10 +38030,15 @@ /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) "lUH" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/layer_manifold/pink/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "lUL" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -37322,12 +38100,6 @@ }, /turf/open/floor/wood, /area/station/service/library) -"lVP" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/station/ai_monitored/turret_protected/aisat_interior) "lVR" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -37576,10 +38348,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plating, /area/station/maintenance/fore) -"mbm" = ( -/obj/structure/cable/multilayer/connected, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/aisat_interior) "mbn" = ( /obj/machinery/light/directional/north, /obj/structure/chair, @@ -37662,6 +38430,19 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/storage_shared) +"mcd" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "mcl" = ( /obj/machinery/light/directional/north, /obj/machinery/power/apc/auto_name/directional/north, @@ -37753,13 +38534,6 @@ dir = 1 }, /area/station/science/explab) -"mdQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/no_smoking{ - pixel_x = -28 - }, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "mdZ" = ( /turf/closed/wall, /area/station/hallway/secondary/service) @@ -37913,6 +38687,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"mgK" = ( +/obj/structure/transit_tube, +/obj/structure/cable, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "mgR" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/reagentgrinder{ @@ -38470,6 +39249,12 @@ "mqt" = ( /turf/open/floor/plating, /area/station/commons/storage/emergency/port) +"mqv" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port to Infiltrate" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mqy" = ( /obj/machinery/shower{ dir = 8 @@ -38652,6 +39437,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +"mtu" = ( +/obj/machinery/door/airlock/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/atmos/hfr_room) "mtv" = ( /obj/structure/chair/stool/directional/east, /turf/open/floor/plating{ @@ -38736,6 +39541,14 @@ /obj/item/stack/cable_coil, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +"muV" = ( +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/machinery/atmospherics/pipe/multiz/violet/visible{ + name = "Infiltrate" + }, +/obj/effect/turf_decal/tile/dark_green/diagonal_edge, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/atmos/mix) "mvc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38773,6 +39586,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"mvS" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "mvU" = ( /obj/machinery/button/door/directional/east{ id = "cmoprivacy"; @@ -38899,6 +39717,19 @@ /obj/item/clothing/ears/earmuffs, /turf/open/floor/iron/dark/textured, /area/station/security/range) +"mxP" = ( +/obj/structure/sign/warning/fire{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/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/storage) "mxW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -39165,6 +39996,7 @@ pixel_y = 32 }, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) "mBK" = ( @@ -39233,6 +40065,21 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"mCQ" = ( +/obj/structure/table/reinforced, +/obj/item/hfr_box/body/waste_output{ + pixel_y = -1; + pixel_x = 5 + }, +/obj/item/hfr_box/body/moderator_input{ + pixel_y = 8; + pixel_x = -5 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "mCT" = ( /obj/machinery/hydroponics/soil, /turf/open/floor/grass, @@ -39372,6 +40219,13 @@ "mFE" = ( /turf/closed/wall, /area/station/medical/surgery/aft) +"mFI" = ( +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 8; + name = "Exfiltrate to Waste" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mFP" = ( /obj/machinery/light/directional/east, /obj/structure/cable, @@ -40048,6 +40902,10 @@ /obj/effect/turf_decal/siding/yellow/corner, /turf/open/floor/iron/large, /area/station/engineering/storage) +"mSg" = ( +/obj/structure/transit_tube/crossing/horizontal, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "mSv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40073,6 +40931,14 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +"mSL" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "mSM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40175,10 +41041,6 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"mUG" = ( -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "mUM" = ( /obj/effect/turf_decal/tile/red/anticorner{ dir = 8 @@ -40470,6 +41332,16 @@ icon_state = "platingdmg3" }, /area/station/maintenance/starboard/aft) +"mZh" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "mZk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -40848,13 +41720,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"net" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "neu" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/line{ @@ -41254,6 +42119,16 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/closed/wall/r_wall, /area/station/maintenance/department/medical/central) +"nlf" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 4; + pixel_x = -15 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "nlp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41482,6 +42357,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +"nox" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "noW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41793,8 +42677,7 @@ /turf/closed/wall/r_wall, /area/station/service/lawoffice) "ntn" = ( -/obj/effect/spawner/random/maintenance/three, -/obj/structure/closet/crate, +/obj/structure/reagent_dispensers/plumbed, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "nto" = ( @@ -41893,8 +42776,8 @@ /obj/structure/sign/warning/no_smoking{ pixel_y = -32 }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/turf/open/openspace, +/area/station/engineering/atmos/storage) "nvW" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ @@ -42041,10 +42924,19 @@ /area/station/hallway/primary/aft) "nyp" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "nyA" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -42503,6 +43395,12 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"nEg" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "nEX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/directional/south, @@ -42546,6 +43444,16 @@ }, /turf/open/floor/iron, /area/station/security/prison/mess) +"nFL" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "nFO" = ( /obj/structure/transit_tube/horizontal, /obj/structure/cable, @@ -42919,6 +43827,10 @@ dir = 5 }, /area/station/maintenance/port/aft) +"nMo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "nMu" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -42956,6 +43868,10 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningdock) +"nMD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/mix) "nME" = ( /obj/item/clothing/head/hardhat, /turf/open/floor/plating/snowed/icemoon, @@ -43207,6 +44123,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"nPL" = ( +/obj/structure/table/reinforced, +/obj/item/hfr_box/body/fuel_input, +/obj/item/hfr_box/body/interface{ + pixel_y = 9; + pixel_x = 6 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "nPU" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -43760,6 +44688,9 @@ /obj/structure/sign/warning/fire{ pixel_x = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) "nXg" = ( @@ -43830,6 +44761,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"nXU" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "nXV" = ( /obj/machinery/door/airlock/security{ name = "Permabrig Visitation" @@ -43924,6 +44867,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"nZw" = ( +/obj/machinery/atmospherics/components/binary/crystallizer{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "nZy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44126,6 +45075,23 @@ /obj/structure/stairs/east, /turf/open/floor/iron/white, /area/station/science/ordnance) +"odr" = ( +/obj/machinery/door/airlock/atmos{ + name = "Turbine Access" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor/heavy, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "odt" = ( /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -44353,6 +45319,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"ohf" = ( +/obj/machinery/status_display/evac/directional/south, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "ohp" = ( /turf/open/floor/glass, /area/station/maintenance/department/medical/central) @@ -44588,11 +45558,15 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/junction{ - dir = 4 +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 }, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "okx" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -45387,6 +46361,15 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/commons/storage/primary) +"oxv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/west{ + c_tag = "Incinerator" + }, +/obj/machinery/atmospherics/components/tank/plasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "oxB" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -45491,6 +46474,11 @@ "oyW" = ( /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/hallway) +"oyY" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "ozn" = ( /turf/open/floor/iron/dark, /area/station/engineering/lobby) @@ -45824,6 +46812,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +"oDz" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Port to Infiltrate/Filter" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "oDB" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating, @@ -45939,7 +46934,6 @@ "oFP" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/item/analyzer, /obj/item/pipe_dispenser, /turf/open/floor/iron/dark, @@ -46063,6 +47057,13 @@ }, /turf/open/floor/plating, /area/station/engineering/storage_shared) +"oHA" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "oHG" = ( /obj/item/flashlight/lantern, /obj/machinery/light/directional/south, @@ -46154,12 +47155,6 @@ /obj/machinery/ticket_machine/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) -"oKq" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/station/maintenance/aft/greater) "oKv" = ( /obj/item/trash/popcorn, /turf/open/floor/plating, @@ -46543,7 +47538,9 @@ /area/station/hallway/primary/central) "oQI" = ( /obj/item/cigbutt, -/obj/structure/sign/warning/cold_temp, +/obj/structure/sign/warning/cold_temp{ + pixel_y = -32 + }, /obj/structure/sign/warning/gas_mask{ pixel_y = 32 }, @@ -46606,6 +47603,13 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/wood, /area/station/hallway/secondary/service) +"oRE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) "oSa" = ( /obj/machinery/door/airlock/public/glass{ id_tag = "gulag3"; @@ -46654,6 +47658,16 @@ /obj/structure/stairs/south, /turf/open/floor/iron/dark/textured, /area/station/security/prison) +"oSG" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "oSR" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -46733,6 +47747,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) "oTK" = ( @@ -46829,6 +47844,9 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"oVE" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "oVR" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -47005,6 +48023,13 @@ /obj/machinery/bluespace_vendor/directional/south, /turf/open/floor/iron, /area/station/commons/locker) +"oYC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/green{ + dir = 1 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "oYH" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/effect/landmark/start/botanist, @@ -47106,10 +48131,10 @@ /turf/open/floor/plating, /area/station/maintenance/fore/greater) "paq" = ( -/obj/structure/table, -/obj/item/stack/cable_coil, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/light/directional/north, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "par" = ( /obj/structure/toilet/greyscale, /obj/machinery/airalarm/directional/east, @@ -47536,6 +48561,18 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/maintenance/department/electrical) +"pgh" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4; + name = "Exfiltrate Control" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "pgi" = ( /obj/machinery/status_display/evac/directional/west, /obj/machinery/light/small/directional/west, @@ -48019,6 +49056,12 @@ icon_state = "panelscorched" }, /area/station/maintenance/starboard/fore) +"poK" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "poR" = ( /obj/structure/window/reinforced{ dir = 1; @@ -48677,7 +49720,7 @@ dir = 10 }, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "pye" = ( /obj/machinery/light/directional/east, /obj/machinery/status_display/evac/directional/east, @@ -48944,6 +49987,11 @@ dir = 1 }, /area/station/science/lab) +"pDo" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "pDB" = ( /obj/item/radio/intercom/prison/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -49033,6 +50081,14 @@ /obj/machinery/smartfridge, /turf/closed/wall, /area/station/service/bar) +"pFB" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 8 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "pFH" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -49414,6 +50470,20 @@ /obj/structure/sign/warning/xeno_mining, /turf/closed/wall/ice, /area/icemoon/surface/outdoors/nospawn) +"pLf" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/trinary/filter/flipped{ + dir = 4; + name = "Exfiltrate Filter" + }, +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "pLt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49603,10 +50673,17 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/carpet, /area/station/commons/dorms) -"pOq" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/engineering/atmos/project) +"pOr" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/station/maintenance/department/medical/morgue) "pOB" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -49616,6 +50693,12 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark, /area/station/service/chapel) +"pOD" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "pOL" = ( /turf/open/floor/iron/white, /area/station/science/ordnance) @@ -50600,6 +51683,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "qea" = ( @@ -50822,6 +51906,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/science/genetics) +"qib" = ( +/obj/effect/turf_decal/box/white{ + color = "#EFB341" + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "qig" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50905,12 +51995,21 @@ /turf/open/floor/plating, /area/mine/eva) "qkb" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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/maintenance/disposal/incinerator) +/area/station/engineering/atmos/storage) "qkc" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -50990,6 +52089,12 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, /area/station/engineering/engine_smes) +"qkX" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) "qlk" = ( /obj/machinery/door/airlock/external{ glass = 1; @@ -51200,6 +52305,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"qoT" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "qoY" = ( /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating, @@ -51370,6 +52480,16 @@ icon_state = "wood-broken" }, /area/station/maintenance/aft/lesser) +"qrz" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/atmospherics, +/obj/item/holosign_creator/atmos, +/obj/item/holosign_creator/atmos, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "qrB" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; @@ -51456,6 +52576,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/prison/garden) +"qtJ" = ( +/obj/machinery/door/airlock/external{ + name = "External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "qtS" = ( /obj/machinery/light/directional/north, /turf/open/misc/asteroid/snow/icemoon, @@ -51695,6 +52824,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/commons/dorms) +"qxq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "qxy" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 4 @@ -51819,12 +52953,26 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"qAg" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "qAz" = ( /obj/structure/disposalpipe/trunk/multiz{ dir = 1 }, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"qAH" = ( +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "qAI" = ( /obj/effect/decal/cleanable/food/flour, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52027,6 +53175,25 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/white, /area/station/science/research) +"qFl" = ( +/obj/machinery/door/airlock/atmos, +/obj/structure/cable, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/atmos/hfr_room) "qFn" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Cabins" @@ -52221,11 +53388,8 @@ /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) "qIM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "qIU" = ( /turf/open/floor/iron, /area/station/commons/dorms) @@ -52240,6 +53404,15 @@ /obj/item/cigbutt, /turf/open/floor/wood/large, /area/mine/eva/lower) +"qJC" = ( +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "qJJ" = ( /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, @@ -52690,6 +53863,13 @@ /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"qNT" = ( +/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) "qNV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/decal/cleanable/dirt, @@ -52715,7 +53895,10 @@ /area/station/maintenance/port/fore) "qOk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/electrolyzer, +/obj/structure/sign/warning/no_smoking{ + pixel_x = -28 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "qOl" = ( @@ -52963,7 +54146,17 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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) "qSB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -53123,6 +54316,19 @@ /obj/structure/rack, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"qVI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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) "qVJ" = ( /obj/machinery/disposal/bin, /obj/machinery/light_switch/directional/south, @@ -53234,6 +54440,12 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/upper) +"qXk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/airalarm/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "qXp" = ( /obj/machinery/camera/directional/north{ c_tag = "Research Division Access"; @@ -53587,6 +54799,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"rcr" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) "rcD" = ( /turf/open/floor/carpet/lone, /area/station/service/chapel) @@ -53710,6 +54927,13 @@ dir = 5 }, /area/mine/living_quarters) +"rez" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "reT" = ( /obj/machinery/door/window/left/directional/north{ dir = 4; @@ -54174,6 +55398,11 @@ /obj/structure/chair/pew/right, /turf/open/floor/wood, /area/station/security/prison/rec) +"roP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/grimy, +/area/station/maintenance/aft/greater) "rpa" = ( /obj/structure/closet/athletic_mixed, /turf/open/floor/plating, @@ -54185,6 +55414,10 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) +"rpy" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "rpB" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -54764,16 +55997,18 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "rzQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) +/area/station/engineering/atmos/storage) "rAl" = ( /turf/open/floor/wood{ icon_state = "wood-broken6" @@ -55028,6 +56263,11 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"rDD" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "rDE" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, @@ -55229,18 +56469,22 @@ /turf/open/floor/engine/cult, /area/station/service/library) "rGj" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 + dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible/layer5{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 5 +/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/maintenance/disposal/incinerator) +/area/station/engineering/atmos/storage) "rGl" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/brown{ @@ -55281,10 +56525,20 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "rHj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 5 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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) "rHo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55318,6 +56572,13 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"rIb" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) "rIc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -55725,6 +56986,12 @@ /obj/structure/railing/corner, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +"rQm" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "rQn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55793,6 +57060,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"rRi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "rRk" = ( /obj/structure/table, /obj/item/storage/belt/utility, @@ -56529,6 +57804,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/command/bridge) +"scI" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "scJ" = ( /obj/docking_port/stationary{ dir = 8; @@ -56694,6 +57974,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"sfD" = ( +/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) "sfM" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -56711,10 +57998,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/white, /area/station/medical/psychology) -"sfS" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall, -/area/station/maintenance/aft/greater) "sfY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56741,6 +58024,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) +"sgz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "sgA" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57029,6 +58320,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"skN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "skU" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -57096,6 +58394,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/xenobiology) +"slH" = ( +/obj/structure/cable, +/obj/structure/transit_tube/horizontal, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "slK" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/effect/turf_decal/stripes/line{ @@ -57278,6 +58581,11 @@ /obj/effect/turf_decal/siding/wideplating, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"spu" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/ladder, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "spF" = ( /obj/structure/window/reinforced/plasma{ dir = 4 @@ -57522,8 +58830,19 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) +"ssT" = ( +/obj/structure/table, +/obj/item/stack/cable_coil, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "ssY" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/firealarm/directional/west, @@ -57804,6 +59123,13 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +"sxM" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_red/end, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "sxO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/closet/secure_closet/personal{ @@ -58101,7 +59427,7 @@ c_tag = "Atmospherics Central" }, /obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Filter" + name = "Port to Infiltrate/Filter" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -58722,6 +60048,10 @@ dir = 1 }, /area/station/medical/chemistry) +"sLH" = ( +/obj/structure/marker_beacon/purple, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "sLL" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -58791,6 +60121,13 @@ dir = 1 }, /area/station/security/office) +"sMZ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/simple/pink{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "sNb" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/light/small/directional/west, @@ -58919,6 +60256,13 @@ }, /turf/open/floor/iron/large, /area/station/engineering/main) +"sPH" = ( +/obj/structure/cable, +/obj/structure/transit_tube/curved{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "sPI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -58970,15 +60314,21 @@ /turf/open/floor/carpet, /area/station/service/chapel) "sQz" = ( -/obj/machinery/door/airlock/atmos{ - name = "Turbine Access" - }, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/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) "sQB" = ( /turf/closed/wall, /area/station/security/brig/upper) @@ -59120,6 +60470,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/central) +"sUr" = ( +/obj/effect/turf_decal/box/white, +/obj/effect/turf_decal/arrows/white{ + color = "#0000FF"; + pixel_y = 15 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "sUv" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -59489,6 +60847,10 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/station/maintenance/department/electrical) +"tat" = ( +/obj/structure/transit_tube/horizontal, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors/nospawn) "tau" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59553,13 +60915,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/command/teleporter) -"tbJ" = ( -/obj/structure/disposaloutlet, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "tbL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59834,6 +61189,13 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"thE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "thK" = ( /obj/item/screwdriver{ pixel_y = 10 @@ -59935,6 +61297,12 @@ dir = 1 }, /area/station/service/hydroponics) +"tje" = ( +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/station/ai_monitored/turret_protected/aisat_interior) "tjk" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -60031,6 +61399,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) +"tkE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "tkG" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/weather/snow/corner{ @@ -60702,6 +62077,18 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) +"tvc" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_red/line, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "tvd" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -61501,6 +62888,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig/upper) +"tGD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "tGF" = ( /obj/machinery/camera/directional/east{ c_tag = "Bridge East" @@ -61564,6 +62957,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -61664,6 +63058,15 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) +"tIY" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "tJa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/corner{ @@ -61864,6 +63267,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"tLV" = ( +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + id = "Atmospherics HFR Shutters"; + name = "Atmospherics HFR Shutters"; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "tLW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -61878,6 +63294,14 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"tMf" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "tMk" = ( /obj/machinery/duct, /obj/structure/cable, @@ -61974,6 +63398,15 @@ /obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) +"tPt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "tPw" = ( /obj/structure/grille, /turf/open/floor/plating{ @@ -62137,6 +63570,13 @@ }, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"tSf" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "tSs" = ( /obj/item/flashlight/lantern{ light_on = 1 @@ -62179,6 +63619,13 @@ /obj/structure/railing, /turf/open/floor/iron/dark, /area/station/service/chapel) +"tTy" = ( +/obj/structure/lattice, +/obj/structure/sign/warning{ + pixel_y = -32 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "tTB" = ( /obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ dir = 8 @@ -62306,6 +63753,15 @@ "tVH" = ( /turf/open/floor/iron/white, /area/station/maintenance/fore/greater) +"tVK" = ( +/obj/structure/cable, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "tVR" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -62717,6 +64173,12 @@ "ubq" = ( /turf/open/floor/iron/white, /area/station/medical/storage) +"ubs" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "ubF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /turf/open/floor/iron, @@ -62729,9 +64191,15 @@ /turf/open/floor/iron/dark, /area/station/science/breakroom) "ubZ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4; + name = "Infiltrate Control" + }, +/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "ucl" = ( /obj/machinery/door/window/left/directional/north{ base_state = "right"; @@ -63105,6 +64573,12 @@ /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plating, /area/station/service/hydroponics) +"uiD" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "uiI" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/three, @@ -63330,6 +64804,12 @@ /obj/item/storage/crayons, /turf/open/floor/sepia, /area/station/security/prison/rec) +"umd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "umi" = ( /obj/structure/window/reinforced, /turf/open/floor/iron, @@ -63450,6 +64930,13 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"uny" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "unM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair{ @@ -63588,6 +65075,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"upM" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/project) "upO" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -63688,6 +65178,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"urE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "urG" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/plating/snowed/icemoon, @@ -63723,6 +65219,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +"usD" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 8 + }, +/obj/structure/sign/warning/fire{ + pixel_y = -32 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "usP" = ( /turf/open/misc/asteroid/snow/standard_air, /area/station/science/research) @@ -63955,6 +65461,12 @@ }, /turf/open/floor/plating, /area/mine/eva/lower) +"uwZ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "uxj" = ( /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron/white/side{ @@ -63981,6 +65493,17 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"uxC" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Atmospherics Project Shutters"; + name = "Atmospherics Project Shutters" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "uxF" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, @@ -64038,6 +65561,14 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"uyL" = ( +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "uyO" = ( /obj/machinery/shower{ dir = 1 @@ -64173,6 +65704,14 @@ icon_state = "platingdmg3" }, /area/station/maintenance/port/fore) +"uBb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/closet/radiation, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "uBi" = ( /turf/closed/wall, /area/station/ai_monitored/turret_protected/ai) @@ -64609,6 +66148,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/service/theater) +"uHb" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "uHi" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One"; @@ -65148,6 +66694,15 @@ /obj/structure/noticeboard/directional/east, /turf/open/floor/wood, /area/station/command/meeting_room) +"uQc" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "uQl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -65167,17 +66722,18 @@ /turf/open/floor/iron/textured, /area/station/security/brig) "uQH" = ( -/obj/machinery/door/airlock/atmos{ - name = "Turbine Access" - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor/heavy, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "uQK" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, @@ -65318,6 +66874,14 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine, /area/station/science/xenobiology) +"uUB" = ( +/obj/structure/cable, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "uUH" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ dir = 10 @@ -65406,7 +66970,6 @@ name = "Atmospherics Internal Airlock" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -65460,6 +67023,12 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +"uWC" = ( +/obj/effect/spawner/random/structure/steam_vent, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "uWI" = ( /obj/structure/sign/warning/secure_area{ pixel_x = -32 @@ -65600,6 +67169,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/sorting) +"uYv" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "uYB" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/structure/cable, @@ -65655,6 +67230,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"uZj" = ( +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "uZn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65901,6 +67483,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"vda" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "vdf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -65912,8 +67498,13 @@ /turf/open/floor/iron, /area/station/security/brig/upper) "vdh" = ( -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "vdi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -66069,6 +67660,16 @@ /obj/structure/stairs/north, /turf/open/floor/iron, /area/station/cargo/storage) +"vfj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "vfo" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -66167,12 +67768,11 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/station/service/chapel) -"vhq" = ( -/obj/structure/sign/poster/random/directional/west, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/station/maintenance/aft/lesser) +"vhJ" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "vhL" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -66194,6 +67794,19 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"vhZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "via" = ( /turf/open/floor/iron/white/side{ dir = 6 @@ -66952,14 +68565,31 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "vum" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bookcase/random, /turf/open/floor/plating{ icon_state = "platingdmg2" }, /area/station/maintenance/aft/greater) +"vut" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4; + name = "Exfiltrate To Waste" + }, +/obj/effect/turf_decal/trimline/dark_red/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "vuu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/layer_manifold/dark, @@ -67078,6 +68708,15 @@ dir = 5 }, /area/station/science/lab) +"vvF" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "vvG" = ( /obj/structure/closet{ name = "Evidence Closet 6" @@ -67329,6 +68968,10 @@ dir = 1 }, /area/station/science/research) +"vzA" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/project) "vzD" = ( /turf/closed/wall, /area/station/maintenance/starboard/aft) @@ -67743,8 +69386,18 @@ /area/station/hallway/primary/central) "vFN" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 10 + }, /turf/open/floor/iron, /area/station/engineering/atmos) +"vFX" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "vGg" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -67998,13 +69651,9 @@ /area/station/command/heads_quarters/rd) "vKm" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron, -/area/station/engineering/atmos/project) +/area/station/engineering/atmos/storage) "vKp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68043,12 +69692,12 @@ /turf/open/floor/iron, /area/station/hallway/secondary/service) "vLL" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ - dir = 8 - }, /obj/structure/sign/warning/fire{ pixel_x = -32 }, +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 8 + }, /turf/open/floor/plating/snowed/icemoon, /area/station/medical/virology) "vLY" = ( @@ -68174,6 +69823,10 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +"vOS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) "vPh" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, @@ -68933,6 +70586,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"wak" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "wal" = ( /obj/structure/sign/warning, /turf/closed/wall, @@ -68940,6 +70599,18 @@ "wam" = ( /turf/open/openspace, /area/station/cargo/storage) +"wan" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "waE" = ( /obj/machinery/requests_console/directional/north{ department = "Cargo Bay"; @@ -69157,6 +70828,12 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"weu" = ( +/obj/effect/turf_decal/box/white{ + color = "#9FED58" + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "wew" = ( /obj/structure/chair/stool/directional/north, /obj/effect/turf_decal/tile/red{ @@ -69254,18 +70931,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) -"wgd" = ( -/obj/structure/table, -/obj/item/stack/sheet/plasteel/twenty{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -2; - pixel_y = 2 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "wgn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -69658,6 +71323,12 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) +"wlk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/ladder, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "wlm" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow, @@ -69998,6 +71669,13 @@ "wqx" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/fore) +"wqy" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "wqI" = ( /obj/item/radio/intercom/prison/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -70005,6 +71683,17 @@ }, /turf/open/floor/iron/smooth, /area/station/security/brig) +"wqM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "Atmospherics Project Shutters"; + name = "Atmospherics Project Shutters" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "wqT" = ( /obj/machinery/door/airlock/external{ glass = 1; @@ -70850,6 +72539,12 @@ dir = 1; name = "Air Outlet Pump" }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ + dir = 5 + }, /turf/open/floor/iron/white/corner, /area/station/engineering/atmos) "wEy" = ( @@ -71137,6 +72832,11 @@ /obj/structure/table, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"wIZ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "wJa" = ( /obj/machinery/light/warm/directional/north, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -71269,6 +72969,17 @@ /obj/structure/sign/warning/cold_temp, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) +"wLB" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) +"wLE" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "wLI" = ( /obj/machinery/light/directional/east, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -71824,6 +73535,11 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating/snowed/icemoon, /area/mine/eva/lower) +"wTL" = ( +/obj/structure/cable/multilayer/connected, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat_interior) "wTV" = ( /obj/machinery/camera/directional/south{ c_tag = "Bridge West Entrance" @@ -72046,6 +73762,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +"wXf" = ( +/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) "wXr" = ( /obj/structure/closet/secure_closet/chemical, /obj/effect/turf_decal/trimline/blue/line, @@ -72131,6 +73855,10 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/mine/living_quarters) +"wYA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/maintenance/aft/lesser) "wYJ" = ( /turf/closed/wall, /area/station/engineering/storage_shared) @@ -72583,6 +74311,11 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"xgv" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "xgy" = ( /turf/open/openspace, /area/station/service/hydroponics) @@ -72661,6 +74394,13 @@ /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"xhf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xhv" = ( /obj/machinery/door/window/left/directional/north{ dir = 4; @@ -72714,6 +74454,11 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"xik" = ( +/obj/structure/transit_tube/curved/flipped, +/obj/structure/cable, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "xiq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72920,15 +74665,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"xlO" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "External Access" - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "xmd" = ( /obj/machinery/camera/directional/south{ c_tag = "Locker Room West" @@ -73119,9 +74855,19 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "xoF" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "xoY" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow, @@ -74245,6 +75991,12 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"xIv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "xIF" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, @@ -74559,6 +76311,23 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"xOs" = ( +/obj/machinery/door/airlock/atmos, +/obj/structure/cable, +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron/dark/smooth_half, +/area/station/engineering/atmos/project) "xOM" = ( /obj/structure/table, /obj/machinery/mineral/processing_unit_console, @@ -74731,6 +76500,30 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/eighties/red, /area/station/security/prison/safe) +"xSh" = ( +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/multiz/violet/visible{ + dir = 8; + name = "Infiltrate" + }, +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/effect/turf_decal/tile/dark_green/diagonal_edge, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/atmos/storage) +"xSk" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/disposal/bin, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) "xSl" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -74801,18 +76594,24 @@ /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "xTu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/directional/west{ - c_tag = "Incinerator" - }, -/obj/machinery/atmospherics/components/tank/plasma, -/turf/open/floor/iron, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/cable, +/obj/structure/closet/secure_closet/atmospherics, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "xTy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) +"xTA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "xTQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75359,6 +77158,14 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/smooth, /area/station/security/brig/upper) +"ybE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{ + dir = 4 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "ybF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -75455,10 +77262,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"ycX" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "ycY" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -75693,6 +77496,19 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, /area/station/security/prison/work) +"yhY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_green/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_green/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "yia" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -114885,8 +116701,8 @@ oSU oSU oSU oSU -oSU -oSU +szG +szG oSU oSU oSU @@ -115140,11 +116956,11 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU +szG +szG +szG +szG +szG oSU oSU oSU @@ -115396,12 +117212,12 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU +szG +szG +iDt +sLH +iDt +szG oSU oSU oSU @@ -115653,12 +117469,12 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU +szG +iKe +iDt +iDt +iDt +szG oSU oSU oSU @@ -115910,12 +117726,12 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU +szG +szG +iDt +iDt +cCb +szG oSU oSU oSU @@ -116168,11 +117984,11 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU +szG +szG +iDt +iDt +szG oSU oSU oSU @@ -116426,10 +118242,10 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU +szG +szG +szG +szG oSU oSU oSU @@ -176571,15 +178387,15 @@ udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo +udC +udC +udC +udC +udC +udC +udC +udC +udC tjo tjo tjo @@ -176828,16 +178644,16 @@ udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC tjo tjo tjo @@ -177076,26 +178892,26 @@ nxM nxM nxM aRn -nxM -xMq -xMq -xMq +hjM +dfE +dfE +dfE +dfE +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -177331,29 +179147,29 @@ kzv nxM bjV qdQ -rQG +hVU tHy -nxM -xMq -xMq -xMq +pOr +jWh +ifd +uBb +dfE +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -177586,32 +179402,32 @@ nxM nxM nxM nxM -pBW +itN nxM nxM nJd -nxM -xMq -xMq -xMq +hjM +dkX +vFX +rez +dfE +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -177843,38 +179659,38 @@ ycY rQG rQG rQG -qmK +jsW nxM mco upa -nxM -xMq -xMq -xMq +hjM +dGX +poK +eNk +dfE +dfE +dfE +dfE +dfE +dfE +dfE +dfE +dfE +dfE +udC +udC +udC +udC +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -178103,36 +179919,36 @@ nxM hTR nxM vzY -owG -nxM -nxM -nxM -xMq +cuG +hjM +hjM +hjM +mtu +jAW +wqy +nPL +mCQ +ksm +uyL +qrz +mcd +qAg +dfE +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -178357,40 +180173,40 @@ lAA nxM scw ilN -qck +qAH nxM ntn kmM sYU iio -nxM -xMq +hjM +sgz +skN +wan +uYv +uYv +uYv +uYv +uYv +uYv +mSL +dfE +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -178614,41 +180430,41 @@ scw deN iDt nxM -qck +qAH +qAH +qAH cFJ -qck -qck oiT xUe -nxM -xMq -xMq +hjM +xTA +thE +oVE +umd +hug +hmG +hug +bBs +oVE +oyY +dfE +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -178877,35 +180693,35 @@ nxM mXf nxM nxM -nxM -nxM -xMq +hjM +hjM +liG +oVE +xIv +uZj +hos +uQc +vda +oVE +fbx +dfE +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -179135,35 +180951,35 @@ owG yjK oiT mco -nxM -xMq +hjM +kzo +oVE +hDa +weu +iNX +sUr +vda +oVE +uiD +upM +upM +upM +upM +upM +upM +upM +upM +upM +udC +udC +udC +udC +udC udC udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -179392,17 +181208,28 @@ rwG wtq tIR owG -nxM -xMq -udC -udC +hjM +tVK +oVE +xIv +nox +qib +uHb +vda +oVE +oVE +uxC +kOD +kOD +pDo +rDD +kOD +xgv +wLB +upM udC udC udC -tjo -tjo -tjo -tjo udC udC udC @@ -179471,17 +181298,6 @@ tjo tjo tjo tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo "} (149,1,2) = {" tjo @@ -179649,15 +181465,25 @@ iTB imH nxM qdi -nxM -xMq -xMq -udC -udC -udC -udC -udC -udC +hjM +oHA +oVE +hDd +urE +nlf +urE +kbK +oVE +oVE +wqM +kOD +qNT +kpw +wXf +edE +edE +kOD +upM udC udC udC @@ -179729,16 +181555,6 @@ tjo tjo tjo tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo "} (150,1,2) = {" tjo @@ -179906,17 +181722,26 @@ lAA lAA nxM chC -nxM -xMq -xMq -xMq -udC -udC -udC -udC -udC -udC -udC +hjM +uUB +ybE +kXg +kXg +kXg +tLV +tkE +oVE +oVE +wqM +kOD +icz +joz +tGD +edE +edE +kOD +upM +iDt udC udC udC @@ -179987,15 +181812,6 @@ tjo tjo tjo tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo "} (151,1,2) = {" tjo @@ -180163,11 +181979,27 @@ eJf gjq ilN qck -ilN +hjM +dfE +dfE +hoj +hoj +hoj +jAW +qFl +hoj +hoj +uBA +vhJ +nZw +ijc +edE +edE +edE +lvZ +upM iDt iDt -xMq -udC udC udC udC @@ -180178,22 +182010,6 @@ udC udC udC udC -udC -udC -udC -udC -udC -udC -udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo tjo tjo tjo @@ -180422,17 +182238,24 @@ nxM pvy aUD eJf -iDt -iDt -udC -udC -udC -udC -udC -udC -udC -udC -udC +hku +fHZ +fHZ +fHZ +wlk +wIZ +wIZ +qxq +xOs +mvS +oYC +nMo +edk +edE +edE +boU +vzA +qkX iDt iDt iDt @@ -180443,14 +182266,7 @@ udC udC udC udC -tjo -tjo -tjo -tjo -tjo -tjo -tjo -tjo +udC tjo tjo tjo @@ -180678,17 +182494,24 @@ eJf eJf myZ eJf -eJf -gqG -iDt -iDt -udC -udC -udC -udC -udC -udC -udC +kHf +nMD +cmj +mZh +fHZ +fHZ +fHZ +qxq +hbf +uBA +aFL +pOD +edE +pOD +edE +edE +kOD +upM iDt iDt iDt @@ -180701,13 +182524,6 @@ udC udC udC udC -udC -udC -udC -udC -udC -tjo -tjo tjo tjo tjo @@ -180935,22 +182751,29 @@ myZ myZ myZ myZ -myZ -eJf -gjq -iDt -iDt -udC -udC -udC -iDt +usD +iCM +fcO +sMZ +muV +bYI +yhY +qxq +fHZ +wqM +aDn +sfD +hIb +sfD +edE +edE +wLE +upM iDt +hpx scw iDt iDt -scw -ili -iDt iDt udC udC @@ -180959,13 +182782,6 @@ udC udC udC udC -udC -udC -udC -udC -udC -udC -tjo tjo tjo tjo @@ -181193,28 +183009,28 @@ myZ myZ eJf eJf -eJf -gjq -gjq -iDt -iDt -iDt -iDt -scw -iDt -iDt -iDt -alM -sbZ -alM -alM -alM +hku +nFL +hGk +fHZ +fHZ +hcY +qxq +fHZ +wqM +aDn +kzT +tSf +eFv +qoT +kOD +fGk +ffe alM alM +sbZ alM -udC -udC -udC +iDt udC udC udC @@ -181449,29 +183265,29 @@ eJf myZ eJf eJf -eJf -eJf -eJf -gqG -iDt -nfG -udC -udC -alM -alM -alM -alM -alM -oxO +tTy +iCM +pLf +scI +fHZ +fHZ +hcY +qxq +ffe +ffe +ffe +ffe +wYA +ffe +ffe +ffe +ffe +ffe +goo alM -fWO -oxO -vhq oxO alM -udC -udC -udC +iDt udC udC udC @@ -181705,28 +183521,28 @@ gjq alM mBH wJD -gjq eJf -iDt -iDt -iDt -udC -udC -udC -udC -alM +eJf +iCM +tvc +bFD +fHZ +fHZ +ikJ +qXk +ffe bPn pOV alM -alM -xlO -alM +hCR oxO alM +fWO +alM vVB oxO alM -alM +qtJ alM alM alM @@ -181962,21 +183778,21 @@ udC wCo oxO wCo -gjq +ewk nfG -iDt -udC -udC -udC -udC -udC -udC -alM +hku +bsX +kkI +fHZ +fHZ +gYP +nEg +ffe wuX fWO -oxO -oxO -oxO +hCR +hCR +jOp oxO oxO alM @@ -182221,17 +184037,17 @@ oTF alM iDt iDt -xMq -udC -udC -udC -udC -udC -udC -alM +iCM +aeN +fHZ +fHZ +fHZ +hcY +aqX +ffe oxO alM -alM +hCR alM alM iry @@ -182477,19 +184293,19 @@ alM jUY alM apB -alM -xMq -xMq -xMq -udC -udC -udC -udC -alM +ffe +iCM +fEP +sxM +jjE +jwd +hVD +wak +ffe dcd alM -udC -udC +hCR +alM alM fuD oxO @@ -182734,19 +184550,19 @@ alM oxO dSX paF -alM -xMq -xMq -xMq -xMq -xMq -udC -udC +ffe +bnH +qxq +ubs +rQm +uwZ +dCm +qxq +ffe alM alM +hCR alM -udC -udC alM alM dSX @@ -182987,23 +184803,23 @@ alM alM alM alM -wOH +diY kRt oxO dcd +ffe +rRi +ffe +ffe +ffe +ffe +ffe +ffe +ffe +oxO +oxO +hCR alM -alM -alM -alM -alM -alM -alM -alM -udC -udC -udC -udC -udC udC alM alM @@ -183249,17 +185065,17 @@ oxO oxO oxO oxO -oxO -oxO -oxO -oxO -oxO -oxO -alM +nPI +nPI +nPI +nPI +nPI +nPI alM alM alM alM +oSG alM udC udC @@ -183512,11 +185328,11 @@ fLh iry jXl anE -jOp -oxO -oxO -oxO -oxO +uWC +nPI +nPI +nPI +hCR alM udC udC @@ -183772,7 +185588,7 @@ ffe ffe ffe ffe -oxO +nPI dSX alM udC @@ -184029,7 +185845,7 @@ aRf wyU abe rnQ -oxO +nPI wzg alM udC @@ -184286,7 +186102,7 @@ aRf abe abe rnQ -oxO +nPI alM alM udC @@ -184543,7 +186359,7 @@ bhj abe dAu rnQ -iWM +nPI alM udC udC @@ -184800,7 +186616,7 @@ tOf vPD lqU mDg -iWM +nPI alM alM udC @@ -185057,7 +186873,7 @@ vlI rJe fma ffe -iWM +nPI ipw alM udC @@ -185314,7 +187130,7 @@ lNo pMF clW rkl -iWM +nPI oxO alM udC @@ -185571,8 +187387,8 @@ cyh odd xns ffe -iWM -kRt +nPI +bxt alM udC udC @@ -185829,7 +187645,7 @@ hJi wGN mDg pQG -oxO +hCR alM udC udC @@ -186085,8 +187901,8 @@ abe abe lfs pjr -iWM -iWM +nPI +nPI alM udC udC @@ -186342,7 +188158,7 @@ abe abe abe pjr -oxO +hCR iWM alM udC @@ -186599,7 +188415,7 @@ abe hWu wnB pjr -oxO +hCR iWM alM udC @@ -186856,7 +188672,7 @@ ffe ffe ffe ffe -oxO +hCR iWM alM udC @@ -187113,7 +188929,7 @@ oxO oxO dcd oxO -oxO +hCR dmU alM udC @@ -187366,11 +189182,11 @@ nyJ nyJ nyJ nPI -iWM -iWM -iWM -iWM -iWM +nPI +nPI +nPI +nPI +nPI geW alM udC @@ -239023,7 +240839,7 @@ bID ejQ bID oUN -ycX +djU iRA kfQ pus @@ -239280,7 +241096,7 @@ wSo pvS iHm rXe -hHN +mFI bJD pfa rsW @@ -239537,7 +241353,7 @@ hHN puD jkW sVL -hHN +xhf eBT qKK hpI @@ -239794,7 +241610,7 @@ wMX puD jBe lRR -heC +uny nFV mlC mIk @@ -240044,11 +241860,11 @@ aap gzh cEw rLs -xmL rLs +xmL cEw hcy -puD +fwq hHN nrA flH @@ -240304,11 +242120,11 @@ wwu kwm wwu sBx -djU +fcN hoF -hHN -nrA -jlV +mqv +hMy +nXU baQ hsf rsW @@ -240561,11 +242377,11 @@ tbh tbh tbh hHN -fwq +oDz hHN hHN nrA -jlV +iHY eBT eqm hpI @@ -241593,7 +243409,7 @@ pwc xfB jHQ xfB -xfB +jnH rkm sEX hpI @@ -242623,7 +244439,7 @@ xDG qwF gtg cEw -ePP +qVI kfs kQu bln @@ -242641,7 +244457,7 @@ bln bln bln bln -nFO +slH bln sEB bln @@ -242898,7 +244714,7 @@ bln bln bln bln -oxR +lsJ bln sEB bln @@ -243155,16 +244971,16 @@ sEB sEB sEB sEB -nFO +sPH +vsI +sEB +sEB +sEB +sEB +sEB +sEB sEB sEB -bln -bln -bln -bln -bln -bln -bln mVm bln bln @@ -243412,16 +245228,16 @@ bln bln bln bln -nFO -bln -sEB -bln -bln -bln -bln -bln -bln -bln +tmR +xik +mgK +mgK +kPQ +mgK +mgK +ipM +tmR +tmR tCr bln bln @@ -243650,7 +245466,7 @@ qwF qwF qwF sEB -cEw +hpI qSx kfs bln @@ -243669,16 +245485,23 @@ bln bln bln bln -nFO bln -sEB bln bln bln bln bln bln +tat bln +tmR +sEB +sEB +sEB +sEB +sEB +sEB +sEB mfD mfD mfD @@ -243726,13 +245549,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (144,1,3) = {" wNO @@ -243907,10 +245723,13 @@ sEB sEB sEB sEB -vep +hpI sQz wvI wvI +wvI +wvI +wvI pwF wvI wvI @@ -243925,15 +245744,19 @@ sEB sEB sEB sEB -sEB -oxR -tmR +bln +bln +bln +bln +bln +mSg +vsI tmR -sEB -sEB -sEB -sEB -sEB +vsI +bln +bln +bln +bln sEB mfD mfD @@ -243983,13 +245806,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (145,1,3) = {" wNO @@ -244156,20 +245972,23 @@ lvG bVZ tYZ kRP -pOq -pOq -pOq -pOq -pOq -pOq -pOq -uBA -vep +fbe +fbe +fbe +fbe +fbe +fbe +fbe +fbe +fbe gwu -mdQ +wvI xTu kJK qOk +oxv +cnY +bPD arZ liW aLJ @@ -244183,15 +246002,19 @@ bln bln bln bln +bln +bln +bln +bln sdr -vsI -tmR -vsI +dZX +xcZ +dZX +swF bln bln bln bln -sEB mfD bRO xpP @@ -244240,13 +246063,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (146,1,3) = {" wNO @@ -244414,21 +246230,24 @@ cvS cGA kRP gtj +lrV +ssT +jdU +ege +kpk vdh -vdh -vdh -vdh -vdh -vdh -uBA +kpk kzp qkb +vep +oRE +vut ldr vhT iLf icF gRI -hUG +chn mka wvI msd @@ -244440,15 +246259,19 @@ bln bln bln bln -sdr -dZX -xcZ -dZX -swF bln bln bln bln +sdr +dZX +nto +ote +swF +swF +swF +swF +swF mfD flW xpP @@ -244497,13 +246320,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (147,1,3) = {" wNO @@ -244671,15 +246487,18 @@ cvS lUU kRP jWj -vdh -vdh -vdh -vdh -fGT +rpy +rpy +rpy +lla +lum xoF -uBA -trf +lum +tIY dbN +vep +trf +vhZ nDq etB swx @@ -244697,15 +246516,19 @@ bln bln bln bln -sdr +bln +bln +bln dZX -nto -ote -swF -swF -swF +tis +qci +tWy +wLm swF swF +qFu +gzz +uCg mfD mfD skX @@ -244754,13 +246577,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (148,1,3) = {" wNO @@ -244931,12 +246747,15 @@ pyb erQ erQ erQ -ubZ -net -ivf -uBA -lJA -dbN +vvF +kpk +vdh +kpk +kzp +cTQ +vep +bsf +vfj xwc raA wrP @@ -244953,16 +246772,20 @@ bln bln bln bln +bln +bln +bln +bln dZX -tis -qci -tWy -wLm -swF +ijT +fgU +rIb +rcr swF -qFu -gzz -uCg +xws +eRH +sMp +oYe nSF pnR pnR @@ -245011,13 +246834,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (149,1,3) = {" wNO @@ -245194,6 +247010,9 @@ kqP uQH rzQ rGj +odr +jNS +bnf txE rfS drJ @@ -245210,16 +247029,20 @@ bln bln bln bln +bln +bln +bln +bln dZX -ijT +kJI fgU -nto -bkY -swF -xws -eRH -sMp -oYe +wTL +vMA +oLJ +rYq +yhw +pzY +fQu mJL pnR mXP @@ -245268,13 +247091,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (150,1,3) = {" wNO @@ -245447,9 +247263,12 @@ nXd bUM nyp vKm -jHv -uBA lpJ +lif +lpJ +mxP +vep +xSk xyT jvR fFC @@ -245467,16 +247286,20 @@ bln bln bln bln +bln +bln +bln +bln dZX -kJI +lIW fgU -mbm -vMA -oLJ -rYq -yhw -pzY -fQu +lIW +glS +iDp +doG +orK +bro +sCS rlS frq rlS @@ -245525,13 +247348,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (151,1,3) = {" wNO @@ -245700,17 +247516,20 @@ cvS cvS sZF wIS -vng +wRr npD lUH qIM -vdh -uBA +kTF +iJR +qJC +djf +vep pBI vJE gGo -hUG -iRB +lAg +lvP qSC ldr fIv @@ -245719,21 +247538,25 @@ pmb hPD haQ pKY +iXZ +bln +bln +bln bln bln bln bln bln dZX -lIW -fgU -lIW -glS +dZX +dZX +dZX +hxC iDp -doG -orK -bro -sCS +swF +osm +iqu +fcu uOk pnR usQ @@ -245782,13 +247605,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (152,1,3) = {" wNO @@ -245959,10 +247775,10 @@ sZF sZF kvJ npD -vdh -qIM -vdh -npD +pFB +dkV +kNS +spu npD npD npD @@ -245970,27 +247786,34 @@ npD npD npD fvX +fvX +vOS +vOS oSw ybF wvI wvI wvI wvI -wvI +vep wvI bln bln bln -dZX -dZX -dZX -dZX -hxC -iDp +bln +bln +bln +bln +bln +bln +bln +bln +bln +tje +swF +ycV +vAF swF -osm -iqu -fcu vAn pnR pnR @@ -246039,13 +247862,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (153,1,3) = {" wNO @@ -246214,21 +248030,20 @@ cga rTv sZF sKf -vng +wRr npD -vdh -fEh +pgh +dkV ubZ -axi -ptR -ptR -ptR -oKq -ptR -eZm +npD +npD +sPx +sPx +tbQ +gKq +sZF htn -sfS -tbJ +sZF bln bln bln @@ -246243,11 +248058,19 @@ bln bln bln bln -lVP -swF -ycV -vAF +bln +uer +bln +bln +bln +bln +bln +bln +bln swF +jsq +ben +iol oiy oiy eMK @@ -246296,13 +248119,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (154,1,3) = {" wNO @@ -246471,17 +248287,17 @@ uFz kJC sZF edT -vng +wRr npD -vdh -vdh -xoF +dXI +tMf +xSh npD -sZF -sZF -sZF -sZF -sZF +fLk +sPx +roP +gKq +iye sZF eZu sZF @@ -246501,10 +248317,17 @@ bln bln bln bln +bln +bln +bln +bln +bln +bln +bln swF -jsq -ben -iol +hWi +xkZ +ggR oiy wRJ hsh @@ -246553,13 +248376,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (155,1,3) = {" wNO @@ -246728,20 +248544,20 @@ niJ aue sZF wUb -gNT +tPt npD -vdh +kpk vdh nvP npD iFl qby sPx -iye +tbQ iye sZF dxa -sZF +vjZ bln bln bln @@ -246758,10 +248574,17 @@ bln bln bln bln +bln +bln +bln +bln +bln +bln +bln +swF +swF +swF swF -hWi -xkZ -ggR oiy wRJ hsh @@ -246810,13 +248633,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (156,1,3) = {" wNO @@ -246985,9 +248801,9 @@ sfM tsZ sZF sKf -gNT +tPt npD -jhg +kpk vdh huL npD @@ -247015,10 +248831,17 @@ bln bln bln bln -swF -swF -swF -swF +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln +bln oiy oiy kHU @@ -247067,13 +248890,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (157,1,3) = {" wNO @@ -247242,16 +249058,16 @@ tMO tMO sZF hil -gNT +tPt npD paq vdh -vdh +ohf npD vBa fMB qqc -iye +tbQ iye sZF cBn @@ -247270,7 +249086,14 @@ iAf iAf bln bln -uer +bln +bln +bln +bln +bln +bln +bln +bln bln bln bln @@ -247324,13 +249147,6 @@ wNO wNO wNO wNO -wNO -wNO -wNO -wNO -wNO -wNO -wNO "} (158,1,3) = {" wNO @@ -247499,16 +249315,16 @@ tMO gSa sZF qwO -vng +wRr npD -wgd +kpk vdh -mUG +kpk npD vtr sPI dEi -tbQ +gKq oMs sZF eZu @@ -247756,7 +249572,7 @@ ezf asL sZF sKf -vng +wRr npD npD czO @@ -248013,7 +249829,7 @@ tMO jYy sZF vwr -vng +wRr eZu sDi eZu @@ -248270,7 +250086,7 @@ tMO cAA sZF mEK -vng +wRr lXm sKf hjo @@ -248527,8 +250343,7 @@ sZF sZF sZF hEZ -gNT -sKf +tPt sKf sKf sZF @@ -248538,9 +250353,10 @@ sZF sZF sZF sZF +sZF eZu -npD -npD +sZF +sZF sZF vjZ sZF @@ -248784,21 +250600,21 @@ sWs sWs sWs sWs -osn +xTQ vwN sWs sWs -leE sWs sWs +leE sWs sWs sWs osn -osn +vng cmv ktf -npD +sZF bln bln bln @@ -249055,7 +250871,7 @@ sKf sKf wRr wEV -npD +sZF bln bln bln @@ -250083,7 +251899,7 @@ tmR sZF rzL gea -npD +sZF bln bln bln @@ -250340,7 +252156,7 @@ tmR sZF oHS wEV -npD +sZF bln bln bln @@ -251368,7 +253184,7 @@ eAw sZF pHR wEV -npD +sZF bln bln bln @@ -251625,13 +253441,13 @@ tmR sZF pHR wEV -npD +sZF bln bln bln bln bln -bgx +vzD vzD vzD gQw @@ -251888,7 +253704,7 @@ bln bln bln bln -bgx +vzD oIR uJC jCl @@ -252145,7 +253961,7 @@ bln bln bln bln -bgx +vzD vzD vzD kir @@ -252402,7 +254218,7 @@ bln bln bln bln -bgx +vzD jRB dFG uZc @@ -252653,13 +254469,13 @@ jCl vzD mVD cEu -bgx -bgx -bgx -bgx -bgx -bgx -bgx +vzD +vzD +vzD +vzD +vzD +vzD +vzD uZc uZc sGZ From 787bc3e0f73223b901fb49087bffe0219e598978 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 01:31:31 -0600 Subject: [PATCH 02/22] Short Tweaks Some pipes were invisible, also the transit tube was borked. --- .../map_files/IceBoxStation/IceBoxStation.dmm | 74 +++++++++---------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index dca28a0b1775c1..9c6258f5bb9415 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -7153,7 +7153,7 @@ /area/station/maintenance/aft/lesser) "cmj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/layer_manifold/general{ +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 1 }, /turf/open/floor/iron/dark, @@ -34618,11 +34618,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"kPQ" = ( -/obj/structure/transit_tube/crossing, -/obj/structure/cable, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "kQc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41337,7 +41332,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -58394,11 +58389,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/xenobiology) -"slH" = ( -/obj/structure/cable, -/obj/structure/transit_tube/horizontal, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "slK" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/effect/turf_decal/stripes/line{ @@ -60123,7 +60113,7 @@ /area/station/security/office) "sMZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/pink{ +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60847,10 +60837,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/station/maintenance/department/electrical) -"tat" = ( -/obj/structure/transit_tube/horizontal, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors/nospawn) "tau" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -67023,6 +67009,12 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +"uWB" = ( +/obj/structure/transit_tube/curved{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "uWC" = ( /obj/effect/spawner/random/structure/steam_vent, /obj/structure/cable, @@ -244457,7 +244449,7 @@ bln bln bln bln -slH +lsJ bln sEB bln @@ -244714,8 +244706,8 @@ bln bln bln bln -lsJ -bln +sPH +vsI sEB bln bln @@ -244971,16 +244963,16 @@ sEB sEB sEB sEB -sPH -vsI -sEB -sEB -sEB -sEB -sEB -sEB -sEB -sEB +tmR +xik +mgK +mgK +mgK +mgK +qHg +tmR +tmR +tmR mVm bln bln @@ -245228,15 +245220,15 @@ bln bln bln bln -tmR -xik -mgK -mgK -kPQ -mgK -mgK -ipM -tmR +bln +bln +bln +bln +bln +bln +vsI +uWB +sEB tmR tCr bln @@ -245492,8 +245484,8 @@ bln bln bln bln -tat -bln +sdr +sEB tmR sEB sEB From b132e16e2adffb53c5c0f6a4b5012dc2f026db24 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 01:37:54 -0600 Subject: [PATCH 03/22] linters --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 9c6258f5bb9415..147d6d87f37755 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -14254,11 +14254,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"ewk" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/openspace/icemoon/keep_below, -/area/icemoon/underground/explored) "ewq" = ( /obj/machinery/light_switch/directional/north, /obj/machinery/light/directional/north, @@ -63741,7 +63736,6 @@ /area/station/maintenance/fore/greater) "tVK" = ( /obj/structure/cable, -/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -183770,7 +183764,7 @@ udC wCo oxO wCo -ewk +eJf nfG hku bsX From 32964f77f4a7bcbc53a347fdd2b64436efde5e9c Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 01:41:09 -0600 Subject: [PATCH 04/22] i have no idea what this means --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 147d6d87f37755..1a7673378c8836 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -11892,7 +11892,6 @@ "dGX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/shower{ - tag = "icon-shower (WEST)"; dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue, From 9a65651865e31aeae53dc63f530952b7cceec41b Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 01:58:25 -0600 Subject: [PATCH 05/22] Updates decalling, more more fixes. --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 1a7673378c8836..e785f652200e4e 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -3918,6 +3918,7 @@ /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 8 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/atmos) "bnt" = ( @@ -11892,6 +11893,7 @@ "dGX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/shower{ + tag = "icon-shower (WEST)"; dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue, @@ -14041,6 +14043,7 @@ "erQ" = ( /obj/machinery/portable_atmospherics/canister, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "erY" = ( @@ -48013,10 +48016,10 @@ /turf/open/floor/iron, /area/station/commons/locker) "oYC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 1 }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) "oYH" = ( @@ -49708,6 +49711,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "pye" = ( @@ -50076,6 +50080,9 @@ dir = 8 }, /obj/machinery/meter, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "pFH" = ( @@ -53102,6 +53109,7 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/atmos) "qEm" = ( @@ -56472,6 +56480,9 @@ /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 }, +/obj/effect/turf_decal/trimline/dark_red/corner{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "rGl" = ( @@ -65546,6 +65557,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, +/obj/item/multitool, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uyO" = ( From aadc8401e9fa59cc45cfd3eff7e5f2c665af1ace Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 02:02:10 -0600 Subject: [PATCH 06/22] runtimes b gone (?) --- .../map_files/IceBoxStation/IceBoxStation.dmm | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index e785f652200e4e..140568b108ab86 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -5751,7 +5751,6 @@ "bPD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/electrolyzer, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "bPE" = ( @@ -7266,7 +7265,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "col" = ( @@ -30039,9 +30037,6 @@ dir = 1 }, /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "jwj" = ( @@ -46359,7 +46354,6 @@ c_tag = "Incinerator" }, /obj/machinery/atmospherics/components/tank/plasma, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "oxB" = ( @@ -53895,7 +53889,6 @@ /obj/structure/sign/warning/no_smoking{ pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "qOl" = ( @@ -57171,6 +57164,11 @@ "rSC" = ( /turf/open/floor/glass/reinforced, /area/station/engineering/lobby) +"rSE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "rSN" = ( /obj/machinery/computer/upload/borg{ dir = 1 @@ -245724,12 +245722,12 @@ hpI sQz wvI wvI -wvI -wvI -wvI -pwF -wvI -wvI +puf +puf +puf +rSE +puf +puf wvI pwF wvI From 2d658fe94c8b4fdba484f48f19f827c27d3f1944 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 02:08:04 -0600 Subject: [PATCH 07/22] Fixes some decalling again --- .../map_files/IceBoxStation/IceBoxStation.dmm | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 140568b108ab86..15f9ee5e970a02 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -5194,9 +5194,9 @@ /area/station/hallway/secondary/exit/departure_lounge) "bFD" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/binary/valve{ +/obj/machinery/atmospherics/components/binary/pump/off/pink/visible{ dir = 4; - name = "Exfiltrate To Port" + name = "Exfiltrate to Port" }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) @@ -24323,9 +24323,9 @@ /area/station/command/teleporter) "hGk" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4; - name = "Exfiltrate To Waste" +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Exfiltrate to Waste" }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) @@ -27735,6 +27735,14 @@ /obj/machinery/atmospherics/pipe/smart/simple/brown/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"iLh" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/arrows/white{ + color = "#0000FF"; + pixel_y = 15 + }, +/turf/open/floor/engine, +/area/station/engineering/atmos/hfr_room) "iLt" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, @@ -38422,7 +38430,10 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty{ + pixel_y = 0; + pixel_x = 2 + }, /obj/item/stack/sheet/iron/fifty, /obj/item/stack/cable_coil{ pixel_x = -3; @@ -41324,7 +41335,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, /turf/open/floor/iron/dark, @@ -60116,7 +60127,7 @@ /area/station/security/office) "sMZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -60465,10 +60476,6 @@ /area/station/hallway/primary/central) "sUr" = ( /obj/effect/turf_decal/box/white, -/obj/effect/turf_decal/arrows/white{ - color = "#0000FF"; - pixel_y = 15 - }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "sUv" = ( @@ -180953,7 +180960,7 @@ hDa weu iNX sUr -vda +iLh oVE uiD upM From 619d283b1dfa6292283a7151cfe6b5d2865b09a6 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 02:09:31 -0600 Subject: [PATCH 08/22] SHUT THE FUCK UP SHOWER. --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 15f9ee5e970a02..c9f2ee9176081a 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -11890,11 +11890,10 @@ /area/station/maintenance/central/lesser) "dGX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue, /obj/machinery/shower{ - tag = "icon-shower (WEST)"; dir = 8 }, -/obj/effect/turf_decal/trimline/dark_blue, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "dHn" = ( From 1b7b03c38f2f99a18311ea8d78dee397f56ee80f Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 02:16:40 -0600 Subject: [PATCH 09/22] converts a valve into a pump --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c9f2ee9176081a..55692b03f77e41 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -68582,13 +68582,13 @@ }, /area/station/maintenance/aft/greater) "vut" = ( -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4; - name = "Exfiltrate To Waste" - }, /obj/effect/turf_decal/trimline/dark_red/filled/warning{ dir = 4 }, +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 8; + name = "Exfiltrate to Waste" + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "vuu" = ( @@ -242379,7 +242379,7 @@ tbh tbh hHN oDz -hHN +oDz hHN nrA iHY From 1cd8c7a5f37ce8e234695dfd450316e6d1290f5e Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 02:28:46 -0600 Subject: [PATCH 10/22] Adds 1 (One) Disposals --- .../map_files/IceBoxStation/IceBoxStation.dmm | 57 +++++++++++++++---- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 55692b03f77e41..83879efe704ff2 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -3941,9 +3941,7 @@ "bnH" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "bnJ" = ( @@ -15234,6 +15232,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/item/radio/intercom/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "eNl" = ( @@ -17914,7 +17915,6 @@ /obj/effect/turf_decal/trimline/dark_red/corner{ dir = 8 }, -/obj/machinery/status_display/ai/directional/north, /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 10 }, @@ -25847,6 +25847,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/status_display/evac/directional/west, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "ife" = ( @@ -30590,6 +30591,14 @@ }, /turf/open/floor/iron, /area/station/science/ordnance) +"jGU" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "jGY" = ( /obj/structure/rack, /obj/item/clothing/suit/hazardvest, @@ -31667,6 +31676,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/duct, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "jWj" = ( @@ -39450,6 +39460,9 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark/smooth_half{ dir = 1 }, @@ -50321,6 +50334,10 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, /area/station/commons/dorms) +"pJp" = ( +/obj/machinery/disposal/bin, +/turf/closed/wall/r_wall, +/area/station/maintenance/department/medical/morgue) "pJu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -50680,6 +50697,7 @@ /obj/machinery/duct, /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -54932,6 +54950,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "reT" = ( @@ -58038,6 +58059,9 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "sgA" = ( @@ -58333,6 +58357,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "skU" = ( @@ -62946,13 +62971,13 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "tHy" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -65705,6 +65730,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/closet/radiation, /obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uBi" = ( @@ -70610,6 +70638,9 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "waE" = ( @@ -71675,6 +71706,10 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "wqI" = ( @@ -179905,8 +179940,8 @@ jJV hjM hjM hjM -hjM -hjM +pJp +pJp hjM ycY rQG @@ -184037,7 +184072,7 @@ alM oTF alM iDt -iDt +ffe iCM aeN fHZ @@ -184295,7 +184330,7 @@ jUY alM apB ffe -iCM +jGU fEP sxM jjE From d7209b345da08db9fc1a3d9f3f88cc9b61313a39 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 12:44:05 -0600 Subject: [PATCH 11/22] will this assuage my aching runtimes atmospherics patch --- .../map_files/IceBoxStation/IceBoxStation.dmm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 83879efe704ff2..19f99488b21ff7 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -24650,7 +24650,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold/violet/visible{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ dir = 4 }, /turf/open/floor/iron, @@ -47835,6 +47835,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, +/obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) "oVy" = ( @@ -49526,7 +49527,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 }, -/obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -61855,6 +61855,11 @@ /obj/machinery/rnd/server/master, /turf/open/openspace/icemoon, /area/station/science/server) +"tsE" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tsH" = ( /obj/machinery/door/airlock/security/glass{ name = "Interrogation" @@ -64950,10 +64955,10 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "uny" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "unM" = ( @@ -241388,7 +241393,7 @@ caS hHN puD jkW -sVL +hHN xhf eBT qKK @@ -241643,7 +241648,7 @@ cEw cEw cEw wMX -puD +xhf jBe lRR uny @@ -241901,7 +241906,7 @@ xmL cEw hcy fwq -hHN +tsE nrA flH jxw @@ -242414,7 +242419,7 @@ tbh tbh hHN oDz -oDz +hHN hHN nrA iHY From 131be8abd74c8e343c7b0290cb196b6013023575 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 12:44:48 -0600 Subject: [PATCH 12/22] no wait THIS will assauge them --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 19f99488b21ff7..e61b2cbb641f9c 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -24647,7 +24647,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "hMy" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 1 }, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ From fa8a4ce57aea2e6e1994de9375646b637aac2eb4 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 13:04:57 -0600 Subject: [PATCH 13/22] More Decalling, More Wall Decor, More Tweaks --- .../map_files/IceBoxStation/IceBoxStation.dmm | 268 +++++++++++++++--- 1 file changed, 224 insertions(+), 44 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index e61b2cbb641f9c..c7e1f800bdf15c 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -36,16 +36,6 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/carpet/red, /area/station/commons/vacant_room/office) -"aaV" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/unres, -/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/medical/morgue) "abb" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -230,6 +220,9 @@ /obj/effect/turf_decal/trimline/dark_red/line{ dir = 1 }, +/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "aeZ" = ( @@ -933,6 +926,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/machinery/light/directional/south, +/obj/effect/turf_decal/trimline/dark_blue/line, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "arb" = ( @@ -1636,6 +1630,14 @@ }, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"aDe" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "aDj" = ( /obj/structure/table/wood, /obj/item/newspaper, @@ -3942,6 +3944,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "bnJ" = ( @@ -4332,6 +4337,9 @@ /obj/effect/turf_decal/trimline/dark_red/line{ dir = 1 }, +/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "bta" = ( @@ -6410,6 +6418,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"cat" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "caw" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow{ @@ -7154,6 +7169,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ dir = 1 }, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "cmq" = ( @@ -10817,6 +10835,13 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"dqL" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "dqR" = ( /obj/machinery/computer/rdconsole, /obj/effect/turf_decal/tile/green{ @@ -11592,6 +11617,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "dCo" = ( @@ -11888,10 +11916,10 @@ /area/station/maintenance/central/lesser) "dGX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/trimline/dark_blue, /obj/machinery/shower{ dir = 8 }, +/obj/effect/turf_decal/trimline/blue, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "dHn" = ( @@ -15375,10 +15403,10 @@ /area/station/cargo/qm) "ePP" = ( /obj/structure/sign/warning/gas_mask{ - pixel_x = 32 + pixel_y = -32 }, /obj/structure/sign/warning/cold_temp{ - pixel_x = -32 + pixel_y = 32 }, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -17909,15 +17937,18 @@ /area/station/security/checkpoint/auxiliary) "fEP" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 5 - }, /obj/effect/turf_decal/trimline/dark_red/corner{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 10 }, +/obj/effect/turf_decal/trimline/dark_blue/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_red/line{ + dir = 5 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "fER" = ( @@ -18659,6 +18690,19 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/station/service/hydroponics) +"fRa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/sign/warning/radiation/rad_area{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "fRb" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -18884,6 +18928,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/storage/primary) +"fVf" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "fVo" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -19547,6 +19596,14 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) +"ggg" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "ggn" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Maintenance" @@ -19603,6 +19660,13 @@ "ghx" = ( /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +"ghC" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage) "ghE" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red{ @@ -19844,6 +19908,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/chapel) +"glq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "glz" = ( /obj/structure/table, /obj/item/paper, @@ -22423,6 +22494,7 @@ "hbf" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/camera/autoname/directional/south, +/obj/effect/turf_decal/trimline/dark_blue/line, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "hbp" = ( @@ -27116,6 +27188,12 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"iAL" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "iAO" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -30532,6 +30610,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) +"jGq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "jGr" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/external, @@ -30597,6 +30682,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "jGY" = ( @@ -31687,6 +31775,7 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /obj/machinery/camera/autoname/directional/north, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "jWl" = ( @@ -34954,6 +35043,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ dir = 6 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "kTO" = ( @@ -36465,6 +36555,7 @@ "lrV" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "lso" = ( @@ -38609,6 +38700,13 @@ "mfH" = ( /turf/closed/wall/r_wall, /area/station/security/brig/upper) +"mfM" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "mfV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, @@ -43409,6 +43507,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/dark_blue/line, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "nEX" = ( @@ -43459,6 +43558,9 @@ /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 1 + }, /obj/effect/turf_decal/trimline/dark_red/end{ dir = 8 }, @@ -45414,6 +45516,15 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +"oio" = ( +/obj/structure/sign/warning/cold_temp{ + pixel_y = 32 + }, +/obj/structure/sign/warning/gas_mask{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "oiq" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/west{ @@ -47838,6 +47949,12 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) +"oVu" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/corner, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "oVy" = ( /obj/machinery/door/airlock/security{ name = "Permabrig Lab" @@ -49070,6 +49187,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/camera/autoname/directional/east, +/obj/structure/sign/warning/radiation/rad_area{ + pixel_x = 32 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "poR" = ( @@ -50656,6 +50776,13 @@ dir = 4 }, /area/station/science/genetics) +"pNK" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "pNO" = ( /obj/machinery/duct, /obj/structure/disposalpipe/segment, @@ -51564,6 +51691,11 @@ icon_state = "wood-broken2" }, /area/station/maintenance/aft/greater) +"qbC" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/line, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "qbF" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/effect/landmark/start/hangover, @@ -54462,6 +54594,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/airalarm/directional/south, /obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "qXp" = ( @@ -57014,6 +57147,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/machinery/light/directional/east, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "rQn" = ( @@ -58610,9 +58746,10 @@ /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) "spu" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/ladder, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/effect/turf_decal/tile/dark_blue/diagonal_edge, +/turf/open/floor/iron/dark/diagonal, /area/station/engineering/atmos/storage) "spF" = ( /obj/structure/window/reinforced/plasma{ @@ -62112,6 +62249,9 @@ dir = 1 }, /obj/machinery/light/directional/north, +/obj/effect/turf_decal/trimline/dark_blue/mid_joiner{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "tvd" = ( @@ -64201,6 +64341,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "ubF" = ( @@ -65354,6 +65497,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/sepia, /area/station/service/library) +"uun" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "uuq" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65489,6 +65640,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/machinery/camera/autoname/directional/east, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "uxj" = ( @@ -65544,9 +65698,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) @@ -67743,6 +67896,14 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/science/xenobiology) +"vgr" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "vgu" = ( /obj/structure/table, /obj/item/toy/plush/beeplushie{ @@ -70624,6 +70785,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/trimline/dark_blue/line, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "wal" = ( @@ -71154,6 +71316,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) @@ -71361,10 +71524,11 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) "wlk" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/ladder, /obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/neutral/diagonal_centre, +/obj/effect/turf_decal/tile/dark_blue/diagonal_edge, +/turf/open/floor/iron/dark/diagonal, /area/station/engineering/atmos/mix) "wlm" = ( /obj/structure/closet/toolcloset, @@ -72876,6 +73040,9 @@ "wIZ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "wJa" = ( @@ -76287,6 +76454,19 @@ "xMT" = ( /turf/closed/wall, /area/station/science/research) +"xMZ" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Maintenance External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "xNa" = ( /obj/effect/landmark/blobstart, /turf/open/floor/engine, @@ -173781,7 +173961,7 @@ udC udC nxM vmP -chC +xMZ oAe aUD udC @@ -176097,7 +176277,7 @@ vAq uOm pnf rQG -aaV +uxU rQG xHk kgl @@ -178932,7 +179112,7 @@ nxM nxM nxM nxM -aRn +fRa hjM dfE dfE @@ -181264,8 +181444,8 @@ kOD kOD pDo rDD -kOD xgv +kOD wLB upM udC @@ -182280,13 +182460,13 @@ pvy aUD eJf hku -fHZ -fHZ -fHZ +pNK +dqL +jGq wlk +aDe wIZ -wIZ -qxq +uun xOs mvS oYC @@ -182539,9 +182719,9 @@ kHf nMD cmj mZh -fHZ -fHZ -fHZ +mfM +dqL +cat qxq hbf uBA @@ -182800,7 +182980,7 @@ muV bYI yhY qxq -fHZ +qbC wqM aDn sfD @@ -183056,8 +183236,8 @@ hGk fHZ fHZ hcY -qxq -fHZ +oVu +glq wqM aDn kzT @@ -183313,7 +183493,7 @@ scI fHZ fHZ hcY -qxq +iAL ffe ffe ffe @@ -183326,7 +183506,7 @@ ffe ffe goo alM -oxO +oio alM iDt udC @@ -184593,12 +184773,12 @@ dSX paF ffe bnH -qxq +ggg ubs rQm uwZ dCm -qxq +vgr ffe alM alM @@ -246530,7 +246710,7 @@ kRP jWj rpy rpy -rpy +fVf lla lum xoF @@ -246785,7 +246965,7 @@ vsZ sDr kRP pyb -erQ +ghC erQ erQ vvF From 6a9c544b661375864553eec3ceec7c31085ddd5b Mon Sep 17 00:00:00 2001 From: san7890 Date: Sat, 11 Jun 2022 22:06:23 -0600 Subject: [PATCH 14/22] Adds Layer Manifolds, Moves Radiation Suit Closet, More Wall Tweaks --- .../map_files/IceBoxStation/IceBoxStation.dmm | 230 ++++++++++-------- 1 file changed, 127 insertions(+), 103 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c7e1f800bdf15c..ea5d962fcb1962 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -2644,6 +2644,14 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +"aSR" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Plasma to Pure" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "aST" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -5303,13 +5311,6 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/maintenance/fore/greater) -"bHy" = ( -/obj/structure/chair/stool/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bHF" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -6005,9 +6006,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 1; - name = "O2 To Pure" +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 1 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -7591,10 +7591,6 @@ /obj/machinery/camera/directional/east{ c_tag = "Atmospherics East" }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Plasma to Pure" - }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -7605,6 +7601,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "cum" = ( @@ -9606,7 +9605,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "cZl" = ( @@ -9896,6 +9894,16 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/cmo, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"dcA" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "O2 to Airmix" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "dcC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11521,11 +11529,10 @@ /turf/closed/wall/r_wall, /area/station/security/prison/visit) "dBb" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "N2 to Airmix" - }, /obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "dBh" = ( @@ -15402,11 +15409,11 @@ /turf/open/floor/iron, /area/station/cargo/qm) "ePP" = ( -/obj/structure/sign/warning/gas_mask{ - pixel_y = -32 - }, /obj/structure/sign/warning/cold_temp{ - pixel_y = 32 + pixel_x = -32 + }, +/obj/structure/sign/warning/gas_mask{ + pixel_x = 32 }, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -17839,6 +17846,10 @@ /obj/effect/landmark/start/warden, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) +"fDg" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/engineering/atmos) "fDi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22566,13 +22577,11 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "hcy" = ( -/obj/structure/closet/radiation, -/obj/effect/turf_decal/stripes/line{ +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 }, -/obj/item/radio/intercom/directional/north, -/obj/item/analyzer, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/iron, /area/station/engineering/atmos) "hcF" = ( /obj/machinery/airalarm/directional/north, @@ -22746,10 +22755,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/xenobiology) -"heC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "heS" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; @@ -23330,9 +23335,8 @@ /turf/open/floor/iron, /area/station/cargo/miningdock) "hoF" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port to Infiltrate/Filter" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -24719,12 +24723,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "hMy" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 1 - }, /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) "hMz" = ( @@ -29033,6 +29035,12 @@ /obj/item/flashlight/lamp, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) +"jdm" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jdJ" = ( /obj/structure/chair/wood, /turf/open/floor/carpet, @@ -30198,7 +30206,10 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "N2 to Airmix" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "jxG" = ( @@ -30351,12 +30362,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics) -"jBe" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "jBh" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -36239,13 +36244,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"lmH" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "O2 to Airmix" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lmK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39037,9 +39035,8 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 1; - name = "N2 To Pure" +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 1 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -39355,8 +39352,8 @@ /turf/open/floor/plating, /area/station/commons/storage/emergency/port) "mqv" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Infiltrate" +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 1 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -40186,6 +40183,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "mCT" = ( @@ -43592,10 +43590,13 @@ /turf/open/floor/iron, /area/station/security/prison/work) "nFV" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "N2 To Pure" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "nGk" = ( @@ -49576,12 +49577,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/station/engineering/atmos) -"puD" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "pve" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -49672,8 +49667,9 @@ /area/station/security/checkpoint/medical) "pwc" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "CO2 to Pure" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -50171,6 +50167,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"pET" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "N2O to Pure" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "pEX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53110,7 +53114,7 @@ /obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/obj/machinery/light/directional/west, +/obj/structure/closet/radiation, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "qAz" = ( @@ -54512,9 +54516,8 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "N2O to Pure" +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 4 }, /turf/open/floor/iron/cafeteria, /area/station/engineering/atmos) @@ -54991,6 +54994,12 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"rdc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rdd" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -59592,7 +59601,7 @@ c_tag = "Atmospherics Central" }, /obj/machinery/atmospherics/components/binary/pump{ - name = "Port to Infiltrate/Filter" + name = "Port to Infiltrate" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -63795,6 +63804,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ dir = 8 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "tTL" = ( @@ -64741,9 +64751,9 @@ /turf/open/floor/plating, /area/station/service/hydroponics) "uiD" = ( -/obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw, /obj/machinery/camera/autoname/directional/south, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uiI" = ( @@ -64774,7 +64784,10 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "O2 To Pure" + }, /turf/open/floor/iron, /area/station/engineering/atmos) "uiZ" = ( @@ -65123,7 +65136,9 @@ /area/station/cargo/office) "uof" = ( /obj/item/cigbutt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "uog" = ( @@ -65745,6 +65760,7 @@ dir = 8 }, /obj/item/multitool, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uyO" = ( @@ -65885,12 +65901,10 @@ "uBb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/closet/radiation, -/obj/effect/turf_decal/bot, /obj/structure/disposalpipe/segment{ - dir = 10 + dir = 5 }, +/obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uBi" = ( @@ -67391,9 +67405,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "CO2 to Pure" +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 4 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -68220,6 +68233,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"vlq" = ( +/obj/structure/chair/stool/directional/east, +/turf/open/floor/iron/half{ + dir = 1 + }, +/area/station/engineering/atmos) "vlD" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ dir = 1 @@ -69265,6 +69284,10 @@ dir = 1 }, /area/station/service/hydroponics) +"vAC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vAF" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Teleporter" @@ -69591,6 +69614,9 @@ /area/station/engineering/atmos) "vFX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot, +/obj/structure/closet/radiation, +/obj/item/analyzer, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "vGg" = ( @@ -73321,9 +73347,7 @@ /area/station/security/office) "wMX" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, +/obj/effect/turf_decal/stripes/end, /turf/open/floor/iron/showroomfloor, /area/station/engineering/atmos) "wNm" = ( @@ -241571,9 +241595,9 @@ bsi uop caS hHN -puD +xhf jkW -hHN +jdm xhf eBT qKK @@ -241828,8 +241852,8 @@ cEw cEw cEw wMX -xhf -jBe +fwq +hHN lRR uny nFV @@ -242085,7 +242109,7 @@ rLs xmL cEw hcy -fwq +rdc tsE nrA flH @@ -242341,7 +242365,7 @@ wwu kwm wwu sBx -fcN +vAC hoF mqv hMy @@ -242595,9 +242619,9 @@ iSl gdv hHN tbh +vlq tbh -tbh -hHN +fDg oDz hHN hHN @@ -242854,7 +242878,7 @@ mxj fcN lxU fcN -bHy +fcN uof uub kYi @@ -243110,15 +243134,15 @@ pGf igx dFC dFC -dFC bnr qEk hHN +lRR tTB -nrA +shj lSR -jxw -lmH +dcA +fQc qxo eVC qwF @@ -243362,17 +243386,17 @@ kFH aen hIA rBQ -heC -heC +fQc +fQc noY ruw fQc fQc fQc mvG -fQc -cZj shj +cZj +hHN vtI cfC fsQ @@ -243618,11 +243642,11 @@ kyr dFp nJI hoV -pwc +pET xfB khe oSX -pwc +aSR xfB cHm xfB From 0d358075349f737b91edf716d1872a096f09e33f Mon Sep 17 00:00:00 2001 From: san7890 Date: Sun, 12 Jun 2022 01:57:18 -0600 Subject: [PATCH 15/22] cheeky firelaam --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index ea5d962fcb1962..7d4d8bb402f6e5 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -65905,6 +65905,7 @@ dir = 5 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uBi" = ( From f3c92216ac4cd906240421f0e5b829ea9abf44bb Mon Sep 17 00:00:00 2001 From: san7890 Date: Sun, 12 Jun 2022 13:44:17 -0600 Subject: [PATCH 16/22] More Signage, Wall Item Tweaks, Maintenance Tweaks, Fire Doors --- .../map_files/IceBoxStation/IceBoxStation.dmm | 112 ++++++++++-------- 1 file changed, 62 insertions(+), 50 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7d4d8bb402f6e5..c4b79e2ae89970 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1877,6 +1877,16 @@ /mob/living/carbon/human/species/monkey/punpun, /turf/open/floor/iron, /area/station/service/bar) +"aGo" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "aGr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/east{ @@ -10307,6 +10317,7 @@ "diY" = ( /obj/structure/rack, /obj/item/crowbar, +/obj/item/picket_sign, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) "djf" = ( @@ -11623,10 +11634,10 @@ "dCm" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, -/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/trimline/dark_blue/line{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "dCo" = ( @@ -15270,6 +15281,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "eNl" = ( @@ -20723,7 +20735,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/item/radio/intercom/directional/south, /obj/item/clothing/glasses/meson/engine/tray, /obj/item/clothing/glasses/meson/engine/tray, /turf/open/floor/iron/showroomfloor, @@ -23308,6 +23319,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "hor" = ( @@ -25261,7 +25273,6 @@ /area/mine/eva) "hUt" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/item/radio/intercom/directional/east, /obj/machinery/camera{ c_tag = "Atmospherics South East"; dir = 6 @@ -25922,6 +25933,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/status_display/evac/directional/west, /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "ife" = ( @@ -29334,15 +29346,18 @@ /turf/open/floor/iron/white, /area/station/medical/chemistry) "jjE" = ( -/obj/effect/turf_decal/trimline/dark_red/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_green/filled/warning, -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/binary/pump/off{ dir = 1; name = "Infiltrate to Exfiltrate" }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/loading_area{ + dir = 1; + color = "#439C1E" + }, +/obj/effect/turf_decal/trimline/dark_red/warning{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "jjG" = ( @@ -31770,6 +31785,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/duct, /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "jWj" = ( @@ -33187,9 +33203,6 @@ c_tag = "Atmospherics - HFR"; name = "atmospherics camera" }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "kso" = ( @@ -33592,6 +33605,7 @@ }, /obj/machinery/camera/autoname/directional/north, /obj/machinery/light/directional/north, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "kzp" = ( @@ -34362,7 +34376,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 }, -/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/engineering/atmos) "kKL" = ( @@ -35221,10 +35234,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/storage) -"kXg" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hfr_room) "kXq" = ( /obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, @@ -35915,6 +35924,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "liI" = ( @@ -38524,9 +38534,6 @@ /turf/open/floor/plating, /area/station/engineering/storage_shared) "mcd" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, /obj/structure/table/reinforced, /obj/item/stack/sheet/glass/fifty{ pixel_y = 0; @@ -39558,6 +39565,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/dark/smooth_half{ dir = 1 }, @@ -40180,9 +40188,6 @@ pixel_y = 8; pixel_x = -5 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) @@ -40815,6 +40820,11 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"mOM" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/sign/warning/fire/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "mOZ" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -41440,12 +41450,12 @@ /area/station/maintenance/starboard/aft) "mZh" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "mZk" = ( @@ -44243,9 +44253,6 @@ pixel_y = 9; pixel_x = 6 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "nPU" = ( @@ -45423,6 +45430,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"ogR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/radiation/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "oha" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -47179,7 +47192,6 @@ /turf/open/floor/plating, /area/station/engineering/storage_shared) "oHA" = ( -/obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, @@ -50829,6 +50841,7 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -52639,9 +52652,7 @@ /obj/item/book/manual/wiki/atmospherics, /obj/item/holosign_creator/atmos, /obj/item/holosign_creator/atmos, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, +/obj/structure/sign/warning/radiation/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "qrB" = ( @@ -53332,7 +53343,6 @@ /area/station/science/research) "qFl" = ( /obj/machinery/door/airlock/atmos, -/obj/structure/cable, /obj/machinery/door/firedoor/heavy, /obj/effect/turf_decal/trimline/yellow/corner, /obj/effect/turf_decal/trimline/yellow/corner{ @@ -55095,6 +55105,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "reT" = ( @@ -58207,6 +58218,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "sgA" = ( @@ -60223,7 +60235,7 @@ }, /area/station/medical/chemistry) "sLH" = ( -/obj/structure/marker_beacon/purple, +/obj/structure/marker_beacon/jade, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) "sLL" = ( @@ -61360,6 +61372,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "thK" = ( @@ -61566,7 +61579,6 @@ /turf/open/floor/iron, /area/station/cargo/storage) "tkE" = ( -/obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{ dir = 4 }, @@ -63442,7 +63454,6 @@ /turf/open/floor/iron, /area/station/science/ordnance/testlab) "tLV" = ( -/obj/structure/cable, /obj/machinery/button/door/directional/east{ id = "Atmospherics HFR Shutters"; name = "Atmospherics HFR Shutters"; @@ -64350,10 +64361,10 @@ "ubs" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, /obj/effect/turf_decal/trimline/dark_blue/line{ dir = 4 }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "ubF" = ( @@ -65695,6 +65706,7 @@ /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 }, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) "uxF" = ( @@ -65756,9 +65768,6 @@ "uyL" = ( /obj/structure/table/reinforced, /obj/item/pipe_dispenser, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, /obj/item/multitool, /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, @@ -65906,6 +65915,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/firealarm/directional/south, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "uBi" = ( @@ -67071,7 +67081,6 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "uUB" = ( -/obj/structure/cable, /obj/machinery/newscaster/directional/east, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 @@ -69611,6 +69620,8 @@ /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, /area/station/engineering/atmos) "vFX" = ( @@ -71924,6 +71935,7 @@ id = "Atmospherics Project Shutters"; name = "Atmospherics Project Shutters" }, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) "wqT" = ( @@ -76856,6 +76868,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "xTQ" = ( @@ -77405,7 +77418,6 @@ /turf/open/floor/iron/smooth, /area/station/security/brig/upper) "ybE" = ( -/obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{ dir = 4 }, @@ -173732,7 +173744,7 @@ hpE xuo hpE iDt -udC +xMq udC udC udC @@ -173989,7 +174001,7 @@ vmP xMZ oAe aUD -udC +xMq udC udC udC @@ -181971,9 +181983,9 @@ chC hjM uUB ybE -kXg -kXg -kXg +oVE +oVE +oVE tLV tkE oVE @@ -181985,7 +181997,7 @@ joz tGD edE edE -kOD +mOM upM iDt udC @@ -182486,7 +182498,7 @@ aUD eJf hku pNK -dqL +aGo jGq wlk aDe @@ -185312,7 +185324,7 @@ oxO oxO oxO nPI -nPI +ogR nPI nPI nPI From 14a9b7b8eb8e8b9c17046d325fca2ac2bc48e566 Mon Sep 17 00:00:00 2001 From: san7890 Date: Sun, 12 Jun 2022 17:28:00 -0600 Subject: [PATCH 17/22] adds stairs --- .../map_files/IceBoxStation/IceBoxStation.dmm | 56 +++++++++++++++++-- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c4b79e2ae89970..bf29f12d6d0567 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -13729,6 +13729,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/construction) +"emk" = ( +/obj/structure/stairs/north{ + dir = 4 + }, +/turf/open/floor/iron/stairs/old{ + dir = 4 + }, +/area/station/engineering/atmos/storage) "emp" = ( /turf/open/floor/iron/dark/side{ dir = 1 @@ -17792,6 +17800,9 @@ /obj/structure/marker_beacon/burgundy, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +"fCc" = ( +/turf/closed/wall/mineral/iron, +/area/station/engineering/atmos/mix) "fCd" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -24102,6 +24113,16 @@ dir = 4 }, /area/station/science/research) +"hAq" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/openspace, +/area/station/engineering/atmos/storage) "hAO" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -40225,6 +40246,14 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/carpet/black, /area/station/security/prison/safe) +"mDq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/white/arrow_ccw, +/obj/effect/turf_decal/trimline/white/arrow_cw{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "mDA" = ( /obj/effect/turf_decal/delivery, /obj/structure/sign/warning/no_smoking{ @@ -42836,6 +42865,14 @@ }, /turf/open/floor/wood/parquet, /area/station/service/bar/atrium) +"nuh" = ( +/obj/structure/stairs/north{ + dir = 4 + }, +/turf/open/floor/iron/stairs/old{ + dir = 4 + }, +/area/station/engineering/atmos/mix) "nul" = ( /obj/machinery/door/airlock/external{ glass = 1; @@ -61995,6 +62032,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) +"tsb" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/white/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/mix) "tsh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -183270,7 +183314,7 @@ eJf hku nFL hGk -fHZ +tsb fHZ hcY oVu @@ -183527,7 +183571,7 @@ tTy iCM pLf scI -fHZ +mDq fHZ hcY iAL @@ -183784,7 +183828,7 @@ eJf iCM tvc bFD -fHZ +nuh fHZ ikJ qXk @@ -184041,7 +184085,7 @@ nfG hku bsX kkI -fHZ +fCc fHZ gYP nEg @@ -249576,8 +249620,8 @@ qwO wRr npD kpk -vdh -kpk +hAq +emk npD vtr sPI From 9637b84d0aaa0abc0abec282341937c3291c056d Mon Sep 17 00:00:00 2001 From: san7890 Date: Tue, 14 Jun 2022 22:09:18 -0600 Subject: [PATCH 18/22] adds new helpers, fixes conflicts, AI fixes --- .../map_files/IceBoxStation/IceBoxStation.dmm | 84 +++++-------------- 1 file changed, 22 insertions(+), 62 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 0f370aecebc104..41334299a55d6a 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -3069,10 +3069,6 @@ "aZf" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/pen{ - pixel_x = 1; - pixel_y = 9 - }, /turf/open/floor/wood, /area/station/maintenance/aft/greater) "aZk" = ( @@ -5252,10 +5248,6 @@ /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "bHU" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/iron/grimy, /area/station/maintenance/aft/greater) @@ -9288,11 +9280,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "cUz" = ( -/obj{ - name = "---Merge conflict marker---" - }, /obj/structure/sign/poster/random/directional/west, -/obj/effect/mapping_helpers/burnt_floor, /turf/closed/wall/r_wall, /area/station/maintenance/aft/lesser) "cVc" = ( @@ -14124,12 +14112,8 @@ /area/station/maintenance/starboard/aft) "etf" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bookcase/random, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/bookcase/random, /turf/open/floor/plating, /area/station/maintenance/aft/greater) "eth" = ( @@ -19786,13 +19770,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "ggp" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "ggG" = ( @@ -26489,6 +26470,8 @@ /turf/open/floor/iron, /area/station/security/prison/garden) "ijM" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "ijT" = ( @@ -29257,22 +29240,13 @@ /turf/open/floor/plating, /area/station/maintenance/aft/greater) "jdH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, /obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) @@ -30340,9 +30314,8 @@ /area/station/service/chapel/office) "jvE" = ( /obj/effect/turf_decal/weather/snow, -/turf/open/floor/plating/icemoon{ - icon_state = "panelscorched" - }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating/icemoon, /area/icemoon/surface/outdoors/nospawn) "jvL" = ( /obj/structure/cable, @@ -36761,9 +36734,6 @@ /area/station/hallway/primary/starboard) "lsA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj{ - name = "---Merge conflict marker---" - }, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) @@ -38211,14 +38181,6 @@ /area/icemoon/surface/outdoors/nospawn) "lSv" = ( /obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -11; - pixel_y = 7 - }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table, /obj/item/paper_bin{ pixel_x = -11; pixel_y = 7 @@ -40710,6 +40672,10 @@ "mJL" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/light/small/directional/south, +/obj/structure/cable/layer3, +/obj/structure/cable, +/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/ai_monitored/turret_protected/aisat_interior) "mJO" = ( @@ -43382,9 +43348,8 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "nAN" = ( /obj/effect/turf_decal/tile/brown{ @@ -46549,11 +46514,10 @@ /turf/open/floor/iron, /area/station/service/janitor) "owB" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/cable, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -48241,12 +48205,6 @@ }, /turf/open/floor/wood/tile, /area/station/service/theater) -"oYe" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/grimy, -/area/station/ai_monitored/turret_protected/aisat_interior) "oYi" = ( /obj/machinery/firealarm/directional/south, /obj/structure/table, @@ -49645,6 +49603,7 @@ /obj/effect/turf_decal/trimline/dark_blue/line{ dir = 4 }, +/obj/machinery/holopad, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "ptx" = ( @@ -55544,10 +55503,6 @@ /obj/structure/sign/poster/random/directional/east, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/sign/poster/random/directional/east, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) @@ -59705,6 +59660,9 @@ /area/station/command/heads_quarters/ce) "sCS" = ( /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/grimy, /area/station/ai_monitored/turret_protected/aisat_interior) "sCY" = ( @@ -67482,6 +67440,7 @@ "vbm" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/newscaster/directional/south, +/obj/machinery/holopad, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) "vbn" = ( @@ -75238,6 +75197,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, +/obj/machinery/holopad, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "xvy" = ( @@ -246839,7 +246799,7 @@ swF xws eRH sMp -oYe +orK nSF pnR pnR From 33710329e042a0f501216262078d867b4a38a7d4 Mon Sep 17 00:00:00 2001 From: san7890 Date: Wed, 15 Jun 2022 22:15:10 -0600 Subject: [PATCH 19/22] adds radiation shutters in a new way --- .../map_files/IceBoxStation/IceBoxStation.dmm | 94 ++++++++++++------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 41334299a55d6a..c39384cc82cb2a 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -17841,17 +17841,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"fzZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hfr_room) "fAo" = ( /obj/structure/table/wood, /obj/item/clothing/under/suit/red, @@ -22199,10 +22188,14 @@ /area/station/engineering/supermatter/room) "gSu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "atmoshfr" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "gSy" = ( @@ -25373,13 +25366,13 @@ "hTt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "hTw" = ( @@ -25582,10 +25575,15 @@ /area/station/medical/virology) "hXd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, /obj/structure/cable, +/obj/machinery/button/door/directional/east{ + id = "Atmospherics HFR Shutters"; + name = "Atmospherics HFR Shutters"; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "hXk" = ( @@ -39523,6 +39521,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"mqj" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "mqq" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -52614,12 +52619,12 @@ /turf/open/floor/iron, /area/station/cargo/storage) "qrI" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, /obj/machinery/camera/autoname/directional/north, /obj/machinery/light/directional/north, /obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "qrY" = ( @@ -54577,10 +54582,14 @@ /area/station/medical/virology) "qXP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 4 - }, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "Atmospherics HFR Shutters" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "qXY" = ( @@ -55419,6 +55428,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/department/medical/morgue) +"rmk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "rmn" = ( /obj/structure/chair/stool/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -60232,12 +60249,12 @@ /obj/effect/turf_decal/siding/yellow/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "sMg" = ( @@ -68163,6 +68180,17 @@ }, /turf/open/floor/iron/textured, /area/station/security/brig) +"vmy" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "vmA" = ( /obj/structure/fluff/tram_rail{ pixel_y = 17 @@ -180453,7 +180481,7 @@ xUe hjM hXd qXP -xHs +rmk nMg xVd hrL @@ -180709,8 +180737,8 @@ nxM nxM hjM hjM -fzZ -xHs +qXd +vmy uXM icv dTt @@ -180967,7 +180995,7 @@ oiT mco hjM qrI -xHs +mqj qUc ppw qkm From f2ad778ff3746a2201f8db94e6166431fbde52b0 Mon Sep 17 00:00:00 2001 From: san7890 Date: Mon, 20 Jun 2022 12:35:03 -0600 Subject: [PATCH 20/22] Unreverts science changes, fixes wall disposals --- .../map_files/IceBoxStation/IceBoxStation.dmm | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c39384cc82cb2a..1954b36acf77f5 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -14512,6 +14512,13 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"eAR" = ( +/obj/machinery/light/directional/east, +/obj/structure/sign/warning/fire{ + pixel_y = 32 + }, +/turf/open/floor/glass/reinforced, +/area/station/science/ordnance/office) "eAS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17331,6 +17338,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, /area/station/science/breakroom) "fsO" = ( @@ -28004,12 +28013,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) -"iLd" = ( -/obj/structure/sign/warning/fire{ - pixel_y = 32 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/ordnance/office) "iLe" = ( /obj/item/radio/intercom/directional/north, /obj/structure/table/glass, @@ -39302,8 +39305,8 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "mna" = ( -/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron/dark, /area/station/science/breakroom) "mnj" = ( @@ -56208,8 +56211,8 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "rAm" = ( -/obj/effect/spawner/random/vending/snackvend, /obj/item/radio/intercom/directional/south, +/obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/iron/dark, /area/station/science/breakroom) "rAr" = ( @@ -179947,7 +179950,7 @@ hjM hjM hjM kcO -kcO +hjM hjM ycY rQG @@ -258334,7 +258337,7 @@ eIC trK fsN krY -iLd +xLq xLq aoo rYZ @@ -258591,7 +258594,7 @@ whP mOc mkx krY -ezJ +eAR xLq iba gas From a3a3b5110f6af93655a377590f9e86c54dc74821 Mon Sep 17 00:00:00 2001 From: san7890 Date: Mon, 20 Jun 2022 12:37:19 -0600 Subject: [PATCH 21/22] why the sussy merge conflict --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 2d54da2d3e77e8..86ef7d9355b62f 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -53247,14 +53247,6 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/breakroom) "qEE" = ( From 51b28d4b05772b9cf6cd1237cae4d14d3ab06aed Mon Sep 17 00:00:00 2001 From: san7890 Date: Tue, 21 Jun 2022 20:33:46 -0600 Subject: [PATCH 22/22] Review Task Complete --- .../map_files/IceBoxStation/IceBoxStation.dmm | 93 ++++++++++++------- 1 file changed, 58 insertions(+), 35 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 86ef7d9355b62f..53233a5fe54e01 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -3900,6 +3900,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +"bnG" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/sign/warning/fire/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "bnJ" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -3918,7 +3923,9 @@ /area/station/science/research) "bnL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/closed/wall/r_wall, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, /area/station/maintenance/aft/lesser) "bnM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -4043,10 +4050,10 @@ /turf/open/floor/engine/cult, /area/station/service/library) "bpR" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "bpT" = ( @@ -5331,6 +5338,7 @@ /obj/effect/turf_decal/trimline/red/filled/end{ dir = 4 }, +/obj/machinery/light/small/red/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "bJc" = ( @@ -17913,6 +17921,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "fBC" = ( @@ -21944,11 +21953,6 @@ dir = 8 }, /area/station/science/research) -"gPK" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/structure/sign/warning/fire/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "gPR" = ( /obj/effect/turf_decal/trimline/green/filled/warning, /obj/machinery/duct, @@ -23184,8 +23188,9 @@ /turf/open/floor/sepia, /area/station/security/prison/rec) "hjR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/closed/wall/r_wall, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/station/engineering/atmos/project) "hkb" = ( /obj/structure/table/wood, @@ -26619,13 +26624,13 @@ "ioO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "atmoshfr" - }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 1 }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "Atmospherics HFR Shutters" + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "ipa" = ( @@ -29978,11 +29983,6 @@ /obj/structure/cable, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"jrX" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "jrZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -31119,7 +31119,6 @@ /area/station/cargo/storage) "jKy" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/newscaster/directional/south, /obj/machinery/holopad, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) @@ -35653,6 +35652,10 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) +"lbs" = ( +/obj/structure/sign/warning/fire/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "lbC" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/camera{ @@ -40364,6 +40367,11 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"mFv" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "mFE" = ( /turf/closed/wall, /area/station/medical/surgery/aft) @@ -41105,6 +41113,10 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +"mSL" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/project) "mSM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41918,7 +41930,6 @@ "neu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) "neC" = ( @@ -58083,10 +58094,6 @@ }, /turf/open/floor/iron, /area/station/cargo/office) -"sdX" = ( -/obj/machinery/disposal/bin, -/turf/closed/wall/r_wall, -/area/station/maintenance/department/medical/morgue) "seA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -61155,6 +61162,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/open/floor/iron/white, /area/station/medical/virology) +"taN" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "taV" = ( /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, @@ -70379,6 +70391,12 @@ "vVH" = ( /turf/closed/wall, /area/station/security/prison/safe) +"vVO" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vVP" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -76096,6 +76114,11 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"xJw" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "xJF" = ( /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, @@ -179947,7 +179970,7 @@ jJV hjM hjM hjM -sdX +hjM hjM hjM ycY @@ -181262,12 +181285,12 @@ foW ljL ljL lii -lub +bnG lub wbk ccg iZO -lub +taN seX kHr udC @@ -181525,7 +181548,7 @@ azB bbs bWK bWK -lub +xJw kHr udC udC @@ -181782,8 +181805,8 @@ fiA ncl bWK bWK -gPK -kHr +lub +mSL iDt udC udC @@ -182040,7 +182063,7 @@ bWK bWK bWK jKy -kHr +mSL iDt iDt udC @@ -182555,7 +182578,7 @@ bWK bWK lub kHr -iDt +lbs iDt iDt iDt @@ -182810,7 +182833,7 @@ rEx eDj bWK bWK -jrX +lub kHr iDt hpx @@ -183066,7 +183089,7 @@ slD tNi asM knX -lub +mFv rbY ffe alM @@ -241396,7 +241419,7 @@ hHN wAB jkW laV -wAB +vVO eBT qKK hpI